mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
Refresh for 70.0.3538.54
This commit is contained in:
@@ -59,7 +59,6 @@ iridium-browser/updater-disable-auto-update.patch
|
||||
iridium-browser/Remove-EV-certificates.patch
|
||||
iridium-browser/safe_browsing-disable-incident-reporting.patch
|
||||
iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
|
||||
iridium-browser/safe_browsing-support-trk-prefix.patch
|
||||
iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
|
||||
iridium-browser/promo-disable-Google-promotion-fetching.patch
|
||||
iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
|
||||
|
||||
@@ -799,7 +799,7 @@
|
||||
"download/download_dir_util.cc",
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -2840,7 +2840,6 @@ jumbo_split_static_library("ui") {
|
||||
@@ -2842,7 +2842,6 @@ jumbo_split_static_library("ui") {
|
||||
"views/cookie_info_view.h",
|
||||
"views/device_chooser_content_view.cc",
|
||||
"views/device_chooser_content_view.h",
|
||||
|
||||
@@ -237,3 +237,14 @@
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
}
|
||||
|
||||
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
|
||||
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
|
||||
@@ -172,7 +172,7 @@ void AccountConsistencyModeManager::Regi
|
||||
registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired,
|
||||
false);
|
||||
#endif
|
||||
- registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);
|
||||
+ registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);
|
||||
}
|
||||
|
||||
// static
|
||||
|
||||
@@ -398,31 +398,27 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
|
||||
CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
|
||||
CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
|
||||
CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
|
||||
--- a/content/renderer/media/webrtc/video_codec_factory.cc
|
||||
+++ b/content/renderer/media/webrtc/video_codec_factory.cc
|
||||
@@ -183,7 +183,11 @@ std::unique_ptr<webrtc::VideoEncoderFact
|
||||
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
|
||||
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
|
||||
@@ -276,10 +276,18 @@ void PeerConnectionDependencyFactory::In
|
||||
|
||||
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
||||
if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
|
||||
if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()) {
|
||||
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideo)) {
|
||||
+ if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideo))
|
||||
+#else
|
||||
!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
|
||||
if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding))
|
||||
+#endif
|
||||
encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
|
||||
decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
|
||||
|
||||
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+ if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideo))
|
||||
+#else
|
||||
if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding))
|
||||
+#endif
|
||||
encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
|
||||
}
|
||||
|
||||
@@ -201,7 +205,11 @@ std::unique_ptr<webrtc::VideoDecoderFact
|
||||
|
||||
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
||||
if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
|
||||
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideo)) {
|
||||
+#else
|
||||
!cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
|
||||
+#endif
|
||||
decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
|
||||
}
|
||||
--- a/content/renderer/render_thread_impl.cc
|
||||
+++ b/content/renderer/render_thread_impl.cc
|
||||
@@ -1415,7 +1415,11 @@ media::GpuVideoAcceleratorFactories* Ren
|
||||
@@ -459,7 +455,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
|
||||
"cr_bugs": [145531, 332596, 571899, 629434],
|
||||
--- a/media/gpu/BUILD.gn
|
||||
+++ b/media/gpu/BUILD.gn
|
||||
@@ -499,6 +499,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
|
||||
@@ -501,6 +501,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
|
||||
}
|
||||
}
|
||||
|
||||
@@ -474,7 +470,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
|
||||
if (use_vaapi) {
|
||||
test("jpeg_encode_accelerator_unittest") {
|
||||
deps = [
|
||||
@@ -569,6 +577,10 @@ if (use_v4l2_codec || use_vaapi) {
|
||||
@@ -571,6 +579,10 @@ if (use_v4l2_codec || use_vaapi) {
|
||||
if (use_ozone) {
|
||||
deps += [ "//ui/ozone" ]
|
||||
}
|
||||
@@ -544,7 +540,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
|
||||
MEDIA_EXPORT extern const char kMuteAudio[];
|
||||
--- a/content/browser/utility_process_host.cc
|
||||
+++ b/content/browser/utility_process_host.cc
|
||||
@@ -298,7 +298,11 @@ bool UtilityProcessHost::StartProcess()
|
||||
@@ -304,7 +304,11 @@ bool UtilityProcessHost::StartProcess()
|
||||
switches::kOverrideUseSoftwareGLForTests,
|
||||
switches::kOverrideEnabledCdmInterfaceVersion,
|
||||
switches::kProxyServer,
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
#else
|
||||
--- a/tools/metrics/histograms/histograms.xml
|
||||
+++ b/tools/metrics/histograms/histograms.xml
|
||||
@@ -131296,6 +131296,7 @@ uploading your change for review.
|
||||
@@ -131333,6 +131333,7 @@ uploading your change for review.
|
||||
<suffix name="Cast"/>
|
||||
<suffix name="ChromeOSRestart"/>
|
||||
<suffix name="ClearBrowsingData"/>
|
||||
@@ -142,7 +142,7 @@
|
||||
void ClearEntriesAddedSince(base::Time begin_time);
|
||||
--- a/tools/metrics/histograms/enums.xml
|
||||
+++ b/tools/metrics/histograms/enums.xml
|
||||
@@ -52360,6 +52360,7 @@ Full version information for the fingerp
|
||||
@@ -52377,6 +52377,7 @@ Full version information for the fingerp
|
||||
<int value="48" label="Open in Chrome"/>
|
||||
<int value="49" label="Site Settings"/>
|
||||
<int value="50" label="App Info"/>
|
||||
|
||||
@@ -457,7 +457,7 @@
|
||||
}
|
||||
|
||||
bool IsGoogleHostname(const GURL& url) {
|
||||
--- a/chrome/common/google_url_loader_throttle.cc
|
||||
--- a/chrome/common/google_url_loader_throttle.cc
|
||||
+++ b/chrome/common/google_url_loader_throttle.cc
|
||||
@@ -33,8 +33,6 @@ void GoogleURLLoaderThrottle::WillStartR
|
||||
if (!is_off_the_record_ &&
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
"cocoa/permission_bubble/chooser_bubble_ui_cocoa.h",
|
||||
"cocoa/permission_bubble/chooser_bubble_ui_cocoa.mm",
|
||||
"cocoa/permission_bubble/chooser_bubble_ui_views_mac.mm",
|
||||
@@ -3362,8 +3358,6 @@ jumbo_split_static_library("ui") {
|
||||
@@ -3364,8 +3360,6 @@ jumbo_split_static_library("ui") {
|
||||
"views/policy/enterprise_startup_dialog_view.h",
|
||||
"views/profiles/forced_reauthentication_dialog_view.cc",
|
||||
"views/profiles/forced_reauthentication_dialog_view.h",
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
[version]
|
||||
chromium_version = 70.0.3538.45
|
||||
chromium_version = 70.0.3538.54
|
||||
release_revision = 1
|
||||
|
||||
Reference in New Issue
Block a user