From d33ff7fe6ae7da9f193e6ffae2118beefa30cc0d Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 1 Oct 2020 23:59:23 -0400 Subject: [PATCH] Update to Chromium version 86.0.4240.68 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/build.patch | 4 ++-- patch/patches/chrome_browser.patch | 8 +++++--- patch/patches/chrome_runtime.patch | 16 ++++++++-------- patch/patches/content_2015.patch | 2 +- patch/patches/prefs_content_1161.patch | 6 +++--- patch/patches/renderer_host_1070713.patch | 4 ++-- .../renderer_preferences_util_545103.patch | 6 +++--- patch/patches/services_network_2622.patch | 6 +++--- patch/patches/services_network_2718.patch | 2 +- .../views_widget_180_1481_1565_1677_1749.patch | 2 +- patch/patches/web_contents_1257_1565.patch | 14 +++++++------- patch/patches/webkit_plugin_info_2015.patch | 4 ++-- patch/patches/webkit_popups.patch | 8 ++++---- 14 files changed, 43 insertions(+), 41 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 4976dcc7a..f0d5e39ed 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/86.0.4240.22', + 'chromium_checkout': 'refs/tags/86.0.4240.68', 'depot_tools_checkout': '5dba9c97fb' } diff --git a/patch/patches/build.patch b/patch/patches/build.patch index c6b1fc1e2..3081a065b 100644 --- a/patch/patches/build.patch +++ b/patch/patches/build.patch @@ -1,8 +1,8 @@ diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn -index 8166e38ceda5..178099b1ac62 100644 +index bafffe27168d..9ab64460ae3c 100644 --- build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn -@@ -1767,8 +1767,6 @@ config("thin_archive") { +@@ -1771,8 +1771,6 @@ config("thin_archive") { # archive names to 16 characters, which is not what we want). if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { arflags = [ "-T" ] diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 2e11ea749..f09fc8cca 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index d5b479bc9991..fa144b20ce37 100644 +index 98ae3acaf7cf..f9a7ec7f44b4 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/crypto.gni") @@ -29,7 +29,7 @@ index d5b479bc9991..fa144b20ce37 100644 if (is_android) { sources += [ "after_startup_task_utils_android.cc", -@@ -3422,8 +3428,6 @@ static_library("browser") { +@@ -3424,8 +3430,6 @@ static_library("browser") { "nearby_sharing/outgoing_share_target_info.h", "nearby_sharing/paired_key_verification_runner.cc", "nearby_sharing/paired_key_verification_runner.h", @@ -38,11 +38,13 @@ index d5b479bc9991..fa144b20ce37 100644 "nearby_sharing/share_target_discovered_callback.h", "nearby_sharing/share_target_info.cc", "nearby_sharing/share_target_info.h", -@@ -3617,13 +3621,6 @@ static_library("browser") { +@@ -3619,15 +3623,6 @@ static_library("browser") { "serial/serial_chooser_context_factory.cc", "serial/serial_chooser_context_factory.h", "serial/serial_chooser_histograms.h", - "sharesheet/sharesheet_controller.h", +- "sharesheet/sharesheet_metrics.cc", +- "sharesheet/sharesheet_metrics.h", - "sharesheet/sharesheet_service.cc", - "sharesheet/sharesheet_service.h", - "sharesheet/sharesheet_service_delegate.cc", diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 695e49b38..f4574c818 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -1,5 +1,5 @@ diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc -index 313975f42c0d..ee7f27dab6b7 100644 +index 3e8b70c47bd2..185f98eceb6c 100644 --- chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc @@ -27,6 +27,7 @@ @@ -19,7 +19,7 @@ index 313975f42c0d..ee7f27dab6b7 100644 #if defined(OS_WIN) // Reach out to chrome_elf for the truth on the user data directory. // Note that in tests, this links to chrome_elf_test_stubs. -@@ -624,7 +627,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() { +@@ -630,7 +633,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() { } #if defined(OS_WIN) @@ -29,7 +29,7 @@ index 313975f42c0d..ee7f27dab6b7 100644 base::sequence_manager::internal::ThreadControllerPowerMonitor:: InitializeOnMainThread(); #endif -@@ -906,6 +911,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -912,6 +917,7 @@ void ChromeMainDelegate::PreSandboxStartup() { std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -37,7 +37,7 @@ index 313975f42c0d..ee7f27dab6b7 100644 crash_reporter::InitializeCrashKeys(); #if defined(OS_POSIX) -@@ -916,6 +922,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -922,6 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitMacCrashReporter(command_line, process_type); SetUpInstallerPreferences(command_line); #endif @@ -45,7 +45,7 @@ index 313975f42c0d..ee7f27dab6b7 100644 #if defined(OS_WIN) child_process_logging::Init(); -@@ -1040,6 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1046,6 +1053,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -53,7 +53,7 @@ index 313975f42c0d..ee7f27dab6b7 100644 #if defined(OS_POSIX) && !defined(OS_MAC) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { -@@ -1072,6 +1080,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1078,6 +1086,7 @@ void ChromeMainDelegate::PreSandboxStartup() { // After all the platform Breakpads have been initialized, store the command // line for crash reporting. crash_keys::SetCrashKeysFromCommandLine(command_line); @@ -61,7 +61,7 @@ index 313975f42c0d..ee7f27dab6b7 100644 #if BUILDFLAG(ENABLE_PDF) MaybeInitializeGDI(); -@@ -1170,6 +1179,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1176,6 +1185,7 @@ void ChromeMainDelegate::ZygoteForked() { SetUpProfilingShutdownHandler(); } @@ -69,7 +69,7 @@ index 313975f42c0d..ee7f27dab6b7 100644 // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets // this up for the browser process in a different manner. const base::CommandLine* command_line = -@@ -1186,6 +1196,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1192,6 +1202,7 @@ void ChromeMainDelegate::ZygoteForked() { // Reset the command line for the newly spawned process. crash_keys::SetCrashKeysFromCommandLine(*command_line); diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index f7704706f..057b2b3d2 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -340,7 +340,7 @@ index 5b0784c844bd..a7b6d3f3c237 100644 // started. virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 16a16b1f075d..94942f76489c 100644 +index c110db6a32bb..a823bbb57f89 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc @@ -3853,7 +3853,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index db52afeaf..9bb005387 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -23,7 +23,7 @@ index 839e3cbde987..ef1b0d7be31f 100644 record_whole_document(false), cookie_enabled(true), diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h -index 700b47b5f521..4cd1cdceaf42 100644 +index 9262a32ce209..b4c9e32b6e69 100644 --- content/public/common/web_preferences.h +++ content/public/common/web_preferences.h @@ -179,6 +179,7 @@ struct CONTENT_EXPORT WebPreferences { @@ -35,10 +35,10 @@ index 700b47b5f521..4cd1cdceaf42 100644 bool record_whole_document; diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc -index 49619a9b5683..52e09111aad3 100644 +index 2852dec8eaf5..881c75a45b2b 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc -@@ -950,6 +950,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, +@@ -951,6 +951,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, #endif WebRuntimeFeatures::EnableTranslateService(prefs.translate_service_available); diff --git a/patch/patches/renderer_host_1070713.patch b/patch/patches/renderer_host_1070713.patch index d07ba6857..1d0757c55 100644 --- a/patch/patches/renderer_host_1070713.patch +++ b/patch/patches/renderer_host_1070713.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc -index 4f914119d21b..5be76fbbda36 100644 +index 3c75954bdcff..7c2c1909d22c 100644 --- content/browser/renderer_host/render_view_host_impl.cc +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -522,6 +522,8 @@ bool RenderViewHostImpl::IsRenderViewLive() { +@@ -521,6 +521,8 @@ bool RenderViewHostImpl::IsRenderViewLive() { } void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { diff --git a/patch/patches/renderer_preferences_util_545103.patch b/patch/patches/renderer_preferences_util_545103.patch index 915b6cbef..e164edc71 100644 --- a/patch/patches/renderer_preferences_util_545103.patch +++ b/patch/patches/renderer_preferences_util_545103.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc -index 0acace592ca4..66cc3c360b79 100644 +index 7ba5b3d1abfe..da7580782644 100644 --- chrome/browser/renderer_preferences_util.cc +++ chrome/browser/renderer_preferences_util.cc -@@ -33,7 +33,8 @@ +@@ -34,7 +34,8 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -12,7 +12,7 @@ index 0acace592ca4..66cc3c360b79 100644 #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -155,7 +156,8 @@ void UpdateFromSystemSettings(blink::mojom::RendererPreferences* prefs, +@@ -162,7 +163,8 @@ void UpdateFromSystemSettings(blink::mojom::RendererPreferences* prefs, prefs->caret_blink_interval = interval; #endif diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 92584b2ef..acd24c198 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc -index e5160aa3ff1a..87b037e517c2 100644 +index 5630448c45aa..92f675e09856 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc @@ -19,6 +19,7 @@ @@ -10,7 +10,7 @@ index e5160aa3ff1a..87b037e517c2 100644 #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" -@@ -668,9 +669,23 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -669,9 +670,23 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( network_context_params->cookie_manager_params = CreateCookieManagerParams(profile_, *cookie_settings_); @@ -35,7 +35,7 @@ index e5160aa3ff1a..87b037e517c2 100644 PrefService* local_state = g_browser_process->local_state(); // Configure the HTTP cache path and size. base::FilePath base_cache_path; -@@ -683,7 +698,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -684,7 +699,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( base_cache_path.Append(chrome::kCacheDirname); network_context_params->http_cache_max_size = local_state->GetInteger(prefs::kDiskCacheSize); diff --git a/patch/patches/services_network_2718.patch b/patch/patches/services_network_2718.patch index 9ecedd9cf..0f28e37e1 100644 --- a/patch/patches/services_network_2718.patch +++ b/patch/patches/services_network_2718.patch @@ -1,5 +1,5 @@ diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc -index eead3ac6a092..372c511b6c77 100644 +index 6996fe8d1be3..3bd057c7d316 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc @@ -487,10 +487,6 @@ class LoginHandlerDelegate { diff --git a/patch/patches/views_widget_180_1481_1565_1677_1749.patch b/patch/patches/views_widget_180_1481_1565_1677_1749.patch index 2b2fd9bb6..58825dc7b 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -73,7 +73,7 @@ index af80b343dcd9..507618362acd 100644 FRIEND_TEST_ALL_PREFIXES( BrowserSideFlingBrowserTest, diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc -index 44586cc1789a..18705ef4e6e7 100644 +index 51342ad75c8d..597b0c67af47 100644 --- content/browser/renderer_host/render_widget_host_view_event_handler.cc +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc @@ -37,6 +37,10 @@ diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 85e02f92d..764305ebb 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 5c0eea105870..1c82c2d0be99 100644 +index 1eadb3f0dace..4316de630cef 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -2578,15 +2578,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2582,15 +2582,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); @@ -33,7 +33,7 @@ index 5c0eea105870..1c82c2d0be99 100644 } CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -3385,6 +3392,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( +@@ -3389,6 +3396,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( // objects. create_params.renderer_initiated_creation = !is_new_browsing_instance; @@ -49,7 +49,7 @@ index 5c0eea105870..1c82c2d0be99 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -6884,6 +6900,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -6910,6 +6926,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, // This is an outermost WebContents. SetAsFocusedWebContentsIfNecessary(); } @@ -73,7 +73,7 @@ index f1dcf53ea481..192f7c0ddd04 100644 WebContents::CreateParams::CreateParams(const CreateParams& other) = default; diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h -index 9d5bc0a3e914..57f2e66ea415 100644 +index e282d97d9b0f..af6eb6506fb8 100644 --- content/public/browser/web_contents.h +++ content/public/browser/web_contents.h @@ -83,8 +83,10 @@ class BrowserContext; @@ -131,10 +131,10 @@ index a10c5caf5a4b..ef8d3c3c1056 100644 // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h -index 3666e0357038..b82c54816894 100644 +index 301fa10bcc3e..37ec8ddd4583 100644 --- content/public/browser/web_contents_observer.h +++ content/public/browser/web_contents_observer.h -@@ -610,6 +610,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener { +@@ -613,6 +613,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener { // WebContents has gained/lost focus. virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {} diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index db57ccf81..dd6ebef30 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -44,10 +44,10 @@ index ba112d79de9a..83f5bd971bc9 100644 DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) { diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index 3d86affee6ad..1d29b9622763 100644 +index 6120b85a4c1a..6b1943e11ce1 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc -@@ -1647,7 +1647,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { +@@ -1652,7 +1652,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { PluginData* LocalFrame::GetPluginData() const { if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) return nullptr; diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 0e41a6b92..7d3bcf00b 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -11,7 +11,7 @@ index 4d55813fed92..f41bd4b5590e 100644 // Cancels and hides the current popup (datetime, select...) if any. virtual void CancelPagePopup() = 0; diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc -index cafd4891c5ba..82c9bf7c917e 100644 +index 54481b3341be..ec210d3be86b 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -216,8 +216,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -30,7 +30,7 @@ index cafd4891c5ba..82c9bf7c917e 100644 } namespace { -@@ -323,6 +328,7 @@ WebViewImpl::WebViewImpl( +@@ -325,6 +330,7 @@ WebViewImpl::WebViewImpl( chrome_client_(MakeGarbageCollected(this)), minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)), maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)), @@ -39,7 +39,7 @@ index cafd4891c5ba..82c9bf7c917e 100644 fullscreen_controller_(std::make_unique(this)), receiver_(this, std::move(page_handle)) { diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h -index b9256a87fdba..e7eaa9a2e448 100644 +index 15e2c9b2bb75..8d2fe1676ba8 100644 --- third_party/blink/renderer/core/exported/web_view_impl.h +++ third_party/blink/renderer/core/exported/web_view_impl.h @@ -125,7 +125,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -52,7 +52,7 @@ index b9256a87fdba..e7eaa9a2e448 100644 // Returns whether frames under this WebView are backed by a compositor. bool does_composite() const { return does_composite_; } -@@ -650,6 +651,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -652,6 +653,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, float fake_page_scale_animation_page_scale_factor_ = 0.f; bool fake_page_scale_animation_use_anchor_ = false;