From 8eaee242de8738ddca063bec2eb8bf4eb3fd80a1 Mon Sep 17 00:00:00 2001 From: xsmile <> Date: Thu, 11 Oct 2018 21:29:35 +0200 Subject: [PATCH] Refresh for 70.0.3538.54 --- config_bundles/common/patch_order.list | 1 - ...01-fix-building-without-safebrowsing.patch | 2 +- .../0006-modify-default-prefs.patch | 11 ++++++ .../inox-patchset/chromium-vaapi-r18.patch | 38 +++++++++---------- .../clear-http-auth-cache-menu-item.patch | 4 +- .../disable-google-host-detection.patch | 2 +- ...ix-building-without-one-click-signin.patch | 2 +- version.ini | 2 +- 8 files changed, 34 insertions(+), 28 deletions(-) diff --git a/config_bundles/common/patch_order.list b/config_bundles/common/patch_order.list index b2f00a3f..94a5c803 100644 --- a/config_bundles/common/patch_order.list +++ b/config_bundles/common/patch_order.list @@ -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 diff --git a/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch b/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch index bed97fb6..d634f638 100644 --- a/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/patches/inox-patchset/0001-fix-building-without-safebrowsing.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", diff --git a/patches/inox-patchset/0006-modify-default-prefs.patch b/patches/inox-patchset/0006-modify-default-prefs.patch index 8abfb0fc..486e7d5d 100644 --- a/patches/inox-patchset/0006-modify-default-prefs.patch +++ b/patches/inox-patchset/0006-modify-default-prefs.patch @@ -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 diff --git a/patches/inox-patchset/chromium-vaapi-r18.patch b/patches/inox-patchset/chromium-vaapi-r18.patch index b641760c..231b445a 100644 --- a/patches/inox-patchset/chromium-vaapi-r18.patch +++ b/patches/inox-patchset/chromium-vaapi-r18.patch @@ -398,31 +398,27 @@ Signed-off-by: Daniel Charles 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_ptrIsGpuVideoAcceleratorEnabled() && + 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_ptrIsGpuVideoAcceleratorEnabled() && -+#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 "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 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 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, diff --git a/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch b/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch index 1448733d..516caeb6 100644 --- a/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch +++ b/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch @@ -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. @@ -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 diff --git a/patches/ungoogled-chromium/disable-google-host-detection.patch b/patches/ungoogled-chromium/disable-google-host-detection.patch index 5ae14fb3..fad3b7e2 100644 --- a/patches/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/ungoogled-chromium/disable-google-host-detection.patch @@ -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_ && diff --git a/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch b/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch index 3f90c10f..d03a3dca 100644 --- a/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch +++ b/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch @@ -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", diff --git a/version.ini b/version.ini index d5c9594e..e2b1b421 100644 --- a/version.ini +++ b/version.ini @@ -1,3 +1,3 @@ [version] -chromium_version = 70.0.3538.45 +chromium_version = 70.0.3538.54 release_revision = 1