From eb5fe4ee134aeddd7da0fbb401d49e2fa93d4f57 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 19 Nov 2019 19:17:53 -0500 Subject: [PATCH] Update to Chromium version 79.0.3945.36 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- libcef/browser/prefs/renderer_prefs.cc | 2 ++ patch/patches/chrome_browser.patch | 6 +++--- patch/patches/chrome_browser_net_export.patch | 2 +- .../chrome_browser_product_override.patch | 6 +++--- patch/patches/chrome_renderer.patch | 6 +++--- patch/patches/content_2015.patch | 16 ++++++++-------- patch/patches/gn_config.patch | 2 +- patch/patches/linux_gtk_2014.patch | 6 +++--- .../renderer_preferences_util_545103.patch | 4 ++-- patch/patches/rwh_background_color_1984.patch | 6 +++--- patch/patches/services_network_2622.patch | 16 ++++++++-------- .../services_network_request_id_2718.patch | 6 +++--- patch/patches/views_1749_2102.patch | 14 +++++++------- .../views_widget_180_1481_1565_1677_1749.patch | 16 ++++++++-------- patch/patches/web_contents_1257_1565.patch | 10 +++++----- patch/patches/webkit_plugin_info_2015.patch | 8 ++++---- patch/patches/webview_plugin_2020.patch | 4 ++-- 18 files changed, 67 insertions(+), 65 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index e13d3ee98..0fb972a9d 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/79.0.3945.1' + 'chromium_checkout': 'refs/tags/79.0.3945.36' } diff --git a/libcef/browser/prefs/renderer_prefs.cc b/libcef/browser/prefs/renderer_prefs.cc index 2b7c0a315..66ab3a7d2 100644 --- a/libcef/browser/prefs/renderer_prefs.cc +++ b/libcef/browser/prefs/renderer_prefs.cc @@ -310,6 +310,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy, blink::kWebRTCIPHandlingDefault); registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string()); + registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false); + registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls); #if !defined(OS_MACOSX) registry->RegisterBooleanPref(prefs::kFullscreenAllowed, true); diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 90be75ace..ae832202b 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 5f4cb5b1c4fe..a082ec93ffe4 100644 +index d3c018287325..07c26487986a 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -9,6 +9,7 @@ import("//build/config/features.gni") @@ -10,7 +10,7 @@ index 5f4cb5b1c4fe..a082ec93ffe4 100644 import("//chrome/common/features.gni") import("//components/feature_engagement/features.gni") import("//components/feed/features.gni") -@@ -1881,6 +1882,7 @@ jumbo_static_library("browser") { +@@ -1880,6 +1881,7 @@ jumbo_static_library("browser") { "//base/util/values:values_util", "//build:branding_buildflags", "//cc", @@ -18,7 +18,7 @@ index 5f4cb5b1c4fe..a082ec93ffe4 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2183,6 +2185,10 @@ jumbo_static_library("browser") { +@@ -2182,6 +2184,10 @@ jumbo_static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_net_export.patch b/patch/patches/chrome_browser_net_export.patch index 329a7da3b..2d289a552 100644 --- a/patch/patches/chrome_browser_net_export.patch +++ b/patch/patches/chrome_browser_net_export.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 99b66171cd0f..46239384714e 100644 +index b0ff168a4ec8..4f5fb430c9d6 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -9,6 +9,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/chrome_browser_product_override.patch b/patch/patches/chrome_browser_product_override.patch index 3fd1e5099..ac42307d6 100644 --- a/patch/patches/chrome_browser_product_override.patch +++ b/patch/patches/chrome_browser_product_override.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 8171dbb425b9..908e745c7285 100644 +index 04a864ebd3e3..4fb7f7daa41f 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc -@@ -992,10 +992,6 @@ void LaunchURL(const GURL& url, +@@ -993,10 +993,6 @@ void LaunchURL(const GURL& url, } } @@ -13,7 +13,7 @@ index 8171dbb425b9..908e745c7285 100644 void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) { // |allowlist| combines pref/policy + cmdline switch in the browser process. // For renderer and utility (e.g. NetworkService) processes the switch is the -@@ -1045,6 +1041,14 @@ void MaybeAddThrottle( +@@ -1057,6 +1053,14 @@ bool IsInHostedApp(WebContents* web_contents) { } // namespace diff --git a/patch/patches/chrome_renderer.patch b/patch/patches/chrome_renderer.patch index 35711c9f3..6e7818d75 100644 --- a/patch/patches/chrome_renderer.patch +++ b/patch/patches/chrome_renderer.patch @@ -1,5 +1,5 @@ diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn -index 5c4d8b63894d..996e15be52b9 100644 +index d3c40c67d587..db2160f68eb7 100644 --- chrome/renderer/BUILD.gn +++ chrome/renderer/BUILD.gn @@ -4,6 +4,7 @@ @@ -10,7 +10,7 @@ index 5c4d8b63894d..996e15be52b9 100644 import("//chrome/common/features.gni") import("//components/nacl/features.gni") import("//components/offline_pages/buildflags/features.gni") -@@ -129,6 +130,7 @@ jumbo_static_library("renderer") { +@@ -127,6 +128,7 @@ jumbo_static_library("renderer") { defines = [] deps = [ @@ -18,7 +18,7 @@ index 5c4d8b63894d..996e15be52b9 100644 "//chrome:resources", "//chrome:strings", "//chrome/common", -@@ -196,6 +198,10 @@ jumbo_static_library("renderer") { +@@ -195,6 +197,10 @@ jumbo_static_library("renderer") { configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index c48a8e20c..2e0a4dba7 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -64,7 +64,7 @@ index e7f241e8db68..fe0b6e546b86 100644 bool GetURLForDrop(const ui::DropTargetEvent& event, GURL* url) { diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc -index 367855448a71..c9e0ecffe5f6 100644 +index 569503d5f870..26e8b0c207c6 100644 --- content/browser/devtools/devtools_http_handler.cc +++ content/browser/devtools/devtools_http_handler.cc @@ -570,7 +570,7 @@ void DevToolsHttpHandler::OnJsonRequest( @@ -346,10 +346,10 @@ index f764efa250cc..9b2e8c053367 100644 virtual void FocusedElementChanged(const blink::WebElement& element) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 8163ba87762e..54978cfe503a 100644 +index e793135c1946..c596719cbb6e 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -4149,7 +4149,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( +@@ -4045,7 +4045,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( std::string mime_type; bool found = false; Send(new FrameHostMsg_GetPluginInfo( @@ -359,7 +359,7 @@ index 8163ba87762e..54978cfe503a 100644 params.mime_type.Utf8(), &found, &info, &mime_type)); if (!found) return nullptr; -@@ -4562,6 +4563,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { +@@ -4453,6 +4454,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { void RenderFrameImpl::FrameFocused() { GetFrameHost()->FrameFocused(); @@ -382,10 +382,10 @@ index e2cb076d3a69..939cc09915c2 100644 &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this))); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc -index 541268de0cc0..4572feb2e954 100644 +index 2a27da46284e..b81a54c9ac5f 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc -@@ -981,6 +981,15 @@ RendererBlinkPlatformImpl::GetGpuFactories() { +@@ -994,6 +994,15 @@ RendererBlinkPlatformImpl::GetGpuFactories() { //------------------------------------------------------------------------------ @@ -402,10 +402,10 @@ index 541268de0cc0..4572feb2e954 100644 if (!code_cache_host_) { code_cache_host_ = mojo::SharedRemote( diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h -index 68be1b765491..8468b1b42b79 100644 +index d8dce6702649..6575e90d7c9c 100644 --- content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h -@@ -209,6 +209,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -210,6 +210,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { media::GpuVideoAcceleratorFactories* GetGpuFactories() override; diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index effa68d83..88937f946 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -12,7 +12,7 @@ index 20f2aad03c82..8cc64748b027 100644 # https://crbug.com/474506. "//clank/java/BUILD.gn", diff --git BUILD.gn BUILD.gn -index b2d4f2f591e9..a19e53cfd6a9 100644 +index 1dc993ffda44..10efbe86e673 100644 --- BUILD.gn +++ BUILD.gn @@ -211,6 +211,7 @@ group("gn_all") { diff --git a/patch/patches/linux_gtk_2014.patch b/patch/patches/linux_gtk_2014.patch index 8dc1a4056..67551707b 100644 --- a/patch/patches/linux_gtk_2014.patch +++ b/patch/patches/linux_gtk_2014.patch @@ -39,10 +39,10 @@ index 07f06ac694f5..831fd9f82dbe 100644 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() { diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn -index dde2eafb88f0..2594b51f35b1 100644 +index 5348e244d9ea..e933e12bceba 100644 --- chrome/test/BUILD.gn +++ chrome/test/BUILD.gn -@@ -4609,7 +4609,7 @@ test("unit_tests") { +@@ -4616,7 +4616,7 @@ test("unit_tests") { if (use_gio) { configs += [ "//build/linux:gio_config" ] } @@ -51,7 +51,7 @@ index dde2eafb88f0..2594b51f35b1 100644 deps += [ "//chrome/browser/ui/libgtkui" ] } -@@ -5666,7 +5666,7 @@ if (!is_android) { +@@ -5673,7 +5673,7 @@ if (!is_android) { # suites, it seems like one or another starts timing out too. "../browser/ui/views/keyboard_access_browsertest.cc", ] diff --git a/patch/patches/renderer_preferences_util_545103.patch b/patch/patches/renderer_preferences_util_545103.patch index b911a03d2..8bb0c404d 100644 --- a/patch/patches/renderer_preferences_util_545103.patch +++ b/patch/patches/renderer_preferences_util_545103.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc -index f96841de67db..df4ebb707bdb 100644 +index ed00da9fe671..5ebbfdbc5a48 100644 --- chrome/browser/renderer_preferences_util.cc +++ chrome/browser/renderer_preferences_util.cc @@ -30,7 +30,8 @@ @@ -12,7 +12,7 @@ index f96841de67db..df4ebb707bdb 100644 #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -130,7 +131,8 @@ void UpdateFromSystemSettings(blink::mojom::RendererPreferences* prefs, +@@ -145,7 +146,8 @@ void UpdateFromSystemSettings(blink::mojom::RendererPreferences* prefs, prefs->caret_blink_interval = interval; #endif diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index df476f73d..29f6003f2 100644 --- a/patch/patches/rwh_background_color_1984.patch +++ b/patch/patches/rwh_background_color_1984.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc -index 448db2a403a6..d7fe170c9dcc 100644 +index d2bca8f54be2..1ced0cc8f5df 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -713,10 +713,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() { +@@ -729,10 +729,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() { void RenderWidgetHostViewAura::UpdateBackgroundColor() { DCHECK(GetBackgroundColor()); @@ -19,7 +19,7 @@ index 448db2a403a6..d7fe170c9dcc 100644 } void RenderWidgetHostViewAura::WindowTitleChanged() { -@@ -2040,6 +2042,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { +@@ -2049,6 +2051,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { // Init(), because it needs to have the layer. if (frame_sink_id_.is_valid()) window_->SetEmbedFrameSinkId(frame_sink_id_); diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index c61b9d9f4..170d85255 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 2788029519d2..205d29075ff8 100644 +index 2813526e1adf..cf8e3dd3e4bf 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc @@ -16,6 +16,7 @@ @@ -10,7 +10,7 @@ index 2788029519d2..205d29075ff8 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" -@@ -484,9 +485,22 @@ ProfileNetworkContextService::CreateNetworkContextParams( +@@ -487,9 +488,22 @@ ProfileNetworkContextService::CreateNetworkContextParams( network_context_params->cookie_manager_params = CreateCookieManagerParams(profile_, *cookie_settings_); @@ -33,7 +33,7 @@ index 2788029519d2..205d29075ff8 100644 PrefService* local_state = g_browser_process->local_state(); // Configure the HTTP cache path and size. base::FilePath base_cache_path; -@@ -499,6 +513,7 @@ ProfileNetworkContextService::CreateNetworkContextParams( +@@ -502,6 +516,7 @@ ProfileNetworkContextService::CreateNetworkContextParams( base_cache_path.Append(chrome::kCacheDirname); network_context_params->http_cache_max_size = local_state->GetInteger(prefs::kDiskCacheSize); @@ -58,7 +58,7 @@ index 756fa14db62a..4fb52050f8a5 100644 // itself, if |relative_path| is empty). virtual mojo::Remote CreateNetworkContext( diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc -index adbda8bdf2c5..779e9e9764cb 100644 +index 5e5b1067d793..31da0f1fbd00 100644 --- net/cookies/cookie_monster.cc +++ net/cookies/cookie_monster.cc @@ -504,6 +504,25 @@ void CookieMonster::SetCookieableSchemes( @@ -117,10 +117,10 @@ index ebec5df3a7ed..718cf4bc7362 100644 virtual void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd, const std::string& parent_absolute_name) const; diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc -index 5a087228a2f1..1f46f8de2ee8 100644 +index 79f5342aca1d..5079e4d02649 100644 --- services/network/cookie_manager.cc +++ services/network/cookie_manager.cc -@@ -219,14 +219,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) { +@@ -217,14 +217,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) { void CookieManager::AllowFileSchemeCookies( bool allow, AllowFileSchemeCookiesCallback callback) { @@ -139,7 +139,7 @@ index 5a087228a2f1..1f46f8de2ee8 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index 8489c08f3b5f..e2c22ea79382 100644 +index 6747b2f4efeb..c6594e903f0c 100644 --- services/network/network_context.cc +++ services/network/network_context.cc @@ -1627,6 +1627,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() { @@ -182,7 +182,7 @@ index 8489c08f3b5f..e2c22ea79382 100644 std::make_unique( params_->accept_language, params_->user_agent); diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom -index 086f4b96cdd9..1fe8d2ccae88 100644 +index b60048c26c3b..c91d0094ebdc 100644 --- services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom @@ -225,6 +225,9 @@ struct NetworkContextParams { diff --git a/patch/patches/services_network_request_id_2718.patch b/patch/patches/services_network_request_id_2718.patch index be4d3a7b2..a180e45ea 100644 --- a/patch/patches/services_network_request_id_2718.patch +++ b/patch/patches/services_network_request_id_2718.patch @@ -1,8 +1,8 @@ diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc -index 818a6370957a..64ab8e2462b5 100644 +index a9318c8de615..b70cd1eb251d 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc -@@ -577,10 +577,6 @@ class LoginHandlerDelegate { +@@ -580,10 +580,6 @@ class LoginHandlerDelegate { } WebContents* web_contents = web_contents_getter_.Run(); @@ -13,7 +13,7 @@ index 818a6370957a..64ab8e2462b5 100644 // WeakPtr is not strictly necessary here due to OnRequestCancelled. creating_login_delegate_ = true; -@@ -637,12 +633,6 @@ void OnAuthRequiredContinuation( +@@ -640,12 +636,6 @@ void OnAuthRequiredContinuation( web_contents_getter = base::BindRepeating(GetWebContents, process_id, routing_id); } diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index 1dc7a4a04..012011cfe 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -1,5 +1,5 @@ diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h -index b0ae539ba1dc..3fd16cbe7e7a 100644 +index 5bcc6204c2b5..1bf18609d150 100644 --- ui/base/models/menu_model.h +++ ui/base/models/menu_model.h @@ -16,6 +16,7 @@ @@ -10,7 +10,7 @@ index b0ae539ba1dc..3fd16cbe7e7a 100644 struct VectorIcon; } -@@ -123,6 +124,27 @@ class UI_BASE_EXPORT MenuModel : public base::SupportsWeakPtr { +@@ -125,6 +126,27 @@ class UI_BASE_EXPORT MenuModel : public base::SupportsWeakPtr { // |event_flags| is a bit mask of ui::EventFlags. virtual void ActivatedAt(int index, int event_flags); @@ -300,10 +300,10 @@ index bdbd9c7e37b8..86138fd1d21c 100644 virtual int GetMaxWidthForMenu(MenuItemView* menu); diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc -index 0fcca1e59688..73fcd369ecb8 100644 +index f58099f2608c..75ce2dbff4e5 100644 --- ui/views/controls/menu/menu_item_view.cc +++ ui/views/controls/menu/menu_item_view.cc -@@ -1067,6 +1067,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas, +@@ -1068,6 +1068,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas, spilling_rect.set_y(spilling_rect.y() - corner_radius_); spilling_rect.set_height(spilling_rect.height() + corner_radius_); canvas->DrawRoundRect(spilling_rect, corner_radius_, flags); @@ -319,7 +319,7 @@ index 0fcca1e59688..73fcd369ecb8 100644 } else if (render_selection) { gfx::Rect item_bounds = GetLocalBounds(); if (type_ == ACTIONABLE_SUBMENU) { -@@ -1133,6 +1142,13 @@ void MenuItemView::PaintMinorIconAndText( +@@ -1134,6 +1143,13 @@ void MenuItemView::PaintMinorIconAndText( } SkColor MenuItemView::GetTextColor(bool minor, bool render_selection) const { @@ -334,10 +334,10 @@ index 0fcca1e59688..73fcd369ecb8 100644 GetMenuController() && GetMenuController()->use_touchable_layout() ? style::CONTEXT_TOUCH_MENU diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc -index 09b72733e66d..4bcee9da5b8a 100644 +index beac9986b2c6..f75e85ae6215 100644 --- ui/views/controls/menu/menu_model_adapter.cc +++ ui/views/controls/menu/menu_model_adapter.cc -@@ -226,6 +226,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const { +@@ -229,6 +229,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const { return false; } 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 45834287c..f55b98450 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -122,7 +122,7 @@ index 78e055820447..9f8a6fd1cd65 100644 // Set the view's active state (i.e., tint state of controls). virtual void SetActive(bool active) = 0; diff --git ui/base/x/x11_window.cc ui/base/x/x11_window.cc -index a98dc5678ad0..8302238f6ea6 100644 +index d679a8e47754..48d5f9ea1a22 100644 --- ui/base/x/x11_window.cc +++ ui/base/x/x11_window.cc @@ -228,8 +228,12 @@ void XWindow::Init(const Configuration& config) { @@ -140,7 +140,7 @@ index a98dc5678ad0..8302238f6ea6 100644 bounds_in_pixels_.height(), 0, // border width diff --git ui/base/x/x11_window.h ui/base/x/x11_window.h -index 505db626f2ec..8ba8d7306714 100644 +index e35f3780bb69..34ba045100b9 100644 --- ui/base/x/x11_window.h +++ ui/base/x/x11_window.h @@ -20,6 +20,7 @@ @@ -160,13 +160,13 @@ index 505db626f2ec..8ba8d7306714 100644 XWindow(); diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc -index e5c489eb1512..87841b48c032 100644 +index 5ab4e781b057..665009a782f4 100644 --- ui/platform_window/x11/x11_window.cc +++ ui/platform_window/x11/x11_window.cc -@@ -75,6 +75,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig( - config.wm_role_name = properties.wm_role_name; - config.activatable = properties.activatable; +@@ -78,6 +78,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig( config.visual_id = properties.x_visual_id; + config.prefer_dark_theme = properties.prefer_dark_theme; + config.background_color = properties.background_color; + config.parent_widget = properties.parent_widget; return config; } @@ -185,10 +185,10 @@ index 70553b153c44..ecd99bc78373 100644 return host ? host->GetAcceleratedWidget() : nullptr; } diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc -index 4f888a102b03..08c111d1a386 100644 +index 46bfbe947fca..7085c6b13508 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc -@@ -335,6 +335,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties( +@@ -339,6 +339,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties( properties->wm_role_name = params.wm_role_name; properties->x_visual_id = pending_x_visual_id_; diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index ca4a043cc..02b55b23f 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 812cfe34f691..308fde5e82d6 100644 +index b8105a844635..212358792a5c 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -2156,21 +2156,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2163,21 +2163,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); @@ -45,7 +45,7 @@ index 812cfe34f691..308fde5e82d6 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -2871,6 +2880,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( +@@ -2878,6 +2887,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( // objects. create_params.renderer_initiated_creation = !is_new_browsing_instance; @@ -61,7 +61,7 @@ index 812cfe34f691..308fde5e82d6 100644 // If |is_new_browsing_instance| is true, defer routing_id allocation // to the WebContentsImpl::Create() call. This is required because with // a new browsing instance, WebContentsImpl::Create() may elect a different -@@ -2916,7 +2934,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( +@@ -2923,7 +2941,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( // TODO(brettw): It seems bogus that we have to call this function on the // newly created object and give it one of its own member variables. RenderWidgetHostView* widget_view = new_view->CreateViewForWidget( @@ -70,7 +70,7 @@ index 812cfe34f691..308fde5e82d6 100644 if (!renderer_started_hidden) { // RenderWidgets for frames always initialize as hidden. If the renderer // created this window as visible, then we show it here. -@@ -6599,7 +6617,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { +@@ -6616,7 +6634,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( RenderViewHost* render_view_host) { RenderWidgetHostViewBase* rwh_view = diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 5fdb95955..90687499b 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -10,10 +10,10 @@ index ff7a8ed89e94..77f44956ff22 100644 + GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array plugins); }; diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h -index e88219cb6640..05ae796f0c61 100644 +index 422cddc5b05c..733a3e7542bd 100644 --- third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h -@@ -722,6 +722,11 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -727,6 +727,11 @@ class BLINK_PLATFORM_EXPORT Platform { // runs during Chromium's build step). virtual bool IsTakingV8ContextSnapshot() { return false; } @@ -44,10 +44,10 @@ index 80a9ec9bc75b..13cbb056cdfa 100644 .Top() .GetSecurityContext() diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index 04ff984896d9..d78549ad7a10 100644 +index a9397ac16719..6f8824a9eb3d 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc -@@ -1173,7 +1173,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { +@@ -1171,7 +1171,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { PluginData* LocalFrame::GetPluginData() const { if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) return nullptr; diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index c34e17a38..24fa73b41 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,8 +1,8 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index fbbadfa2ff7a..c62913a5cf07 100644 +index 021fc110d824..b2703ae850af 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd -@@ -4775,7 +4775,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -4769,7 +4769,7 @@ Keep your key file in a safe place. You will need it to create new versions of y