From 860bf38e47cd19199badfd674ec25320bf963bd6 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 13 Aug 2021 17:53:35 -0400 Subject: [PATCH] Update to Chromium version 93.0.4577.42 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- .../alloy/alloy_render_thread_observer.cc | 4 +++- .../alloy/alloy_render_thread_observer.h | 5 +++-- patch/patch.cfg | 3 --- .../chrome_browser_content_settings.patch | 4 ++-- patch/patches/chrome_browser_profiles.patch | 6 +++--- patch/patches/chrome_plugins.patch | 12 ++++++------ patch/patches/content_2015.patch | 16 ++++++++-------- patch/patches/trace_event.patch | 2 +- patch/patches/views_widget.patch | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index d64bb40bb..0da8f1b97 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/93.0.4577.25', + 'chromium_checkout': 'refs/tags/93.0.4577.42', 'depot_tools_checkout': '45d2afa080' } diff --git a/libcef/renderer/alloy/alloy_render_thread_observer.cc b/libcef/renderer/alloy/alloy_render_thread_observer.cc index 9393f95ea..dec93f226 100644 --- a/libcef/renderer/alloy/alloy_render_thread_observer.cc +++ b/libcef/renderer/alloy/alloy_render_thread_observer.cc @@ -50,7 +50,9 @@ void AlloyRenderThreadObserver::UnregisterMojoInterfaces( void AlloyRenderThreadObserver::SetInitialConfiguration( bool is_incognito_process, - mojo::PendingReceiver chromeos_listener) { + mojo::PendingReceiver chromeos_listener, + mojo::PendingRemote + content_settings_manager) { is_incognito_process_ = is_incognito_process; } diff --git a/libcef/renderer/alloy/alloy_render_thread_observer.h b/libcef/renderer/alloy/alloy_render_thread_observer.h index e554d04cc..98821bf43 100644 --- a/libcef/renderer/alloy/alloy_render_thread_observer.h +++ b/libcef/renderer/alloy/alloy_render_thread_observer.h @@ -37,8 +37,9 @@ class AlloyRenderThreadObserver : public content::RenderThreadObserver, // chrome::mojom::RendererConfiguration: void SetInitialConfiguration( bool is_incognito_process, - mojo::PendingReceiver chromeos_listener) - override; + mojo::PendingReceiver chromeos_listener, + mojo::PendingRemote + content_settings_manager) override; void SetConfiguration(chrome::mojom::DynamicParamsPtr params) override; void SetContentSettingRules( const RendererContentSettingRules& rules) override; diff --git a/patch/patch.cfg b/patch/patch.cfg index f9f055634..f902d8789 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -39,9 +39,6 @@ patches = [ # # Support custom VS toolchain on Windows. # https://bugs.chromium.org/p/chromium/issues/detail?id=623342 - # - # Update "py" wheel to a version that is compatible with pytest-6.2.2. - # https://bugs.chromium.org/p/chromium/issues/detail?id=1231439 'name': 'runhooks', }, { diff --git a/patch/patches/chrome_browser_content_settings.patch b/patch/patches/chrome_browser_content_settings.patch index 51fa269fd..9ca9a26c4 100644 --- a/patch/patches/chrome_browser_content_settings.patch +++ b/patch/patches/chrome_browser_content_settings.patch @@ -54,10 +54,10 @@ index 173582c7c490..bbf57904b6de 100644 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) SupervisedUserSettingsService* supervised_service = diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc -index 610f6d942998..f822df04ff07 100644 +index f27839a59d04..6b5f43762c77 100644 --- components/content_settings/renderer/content_settings_agent_impl.cc +++ components/content_settings/renderer/content_settings_agent_impl.cc -@@ -170,7 +170,7 @@ ContentSetting GetContentSettingFromRulesImpl( +@@ -171,7 +171,7 @@ ContentSetting GetContentSettingFromRulesImpl( return rule.GetContentSetting(); } } diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index db5db286a..defc2e9c8 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -135,7 +135,7 @@ index 915a95e287c5..0424e8bdd7d8 100644 // Returns the directory where the first created profile is stored, // relative to the user data directory currently in use. diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc -index 5e71c1f56da1..db5c46cb5f85 100644 +index c8771e1d5072..4ce60104e0c6 100644 --- chrome/browser/profiles/renderer_updater.cc +++ chrome/browser/profiles/renderer_updater.cc @@ -8,6 +8,7 @@ @@ -143,10 +143,10 @@ index 5e71c1f56da1..db5c46cb5f85 100644 #include "base/bind.h" #include "build/chromeos_buildflags.h" +#include "cef/libcef/features/runtime.h" + #include "chrome/browser/content_settings/content_settings_manager_delegate.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/signin/identity_manager_factory.h" -@@ -57,8 +58,12 @@ void GetGuestViewDefaultContentSettingRules( +@@ -60,8 +61,12 @@ void GetGuestViewDefaultContentSettingRules( } // namespace RendererUpdater::RendererUpdater(Profile* profile) : profile_(profile) { diff --git a/patch/patches/chrome_plugins.patch b/patch/patches/chrome_plugins.patch index 087b80c14..18c0b7b7e 100644 --- a/patch/patches/chrome_plugins.patch +++ b/patch/patches/chrome_plugins.patch @@ -186,10 +186,10 @@ index 88a87fd4d74b..2815c9897d63 100644 // that the X-Frame-Options protection mechanism is set to either DENY or // SAMEORIGIN. diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc -index a6e34d86aa11..1141f02719e9 100644 +index 4cd049fba274..c2129c7bd207 100644 --- chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -919,6 +919,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -925,6 +925,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( if ((status == chrome::mojom::PluginStatus::kUnauthorized || status == chrome::mojom::PluginStatus::kBlocked) && @@ -197,7 +197,7 @@ index a6e34d86aa11..1141f02719e9 100644 content_settings_agent_delegate->IsPluginTemporarilyAllowed( identifier)) { status = chrome::mojom::PluginStatus::kAllowed; -@@ -1122,7 +1123,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1128,7 +1129,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( render_frame->GetRemoteAssociatedInterfaces()->GetInterface( plugin_auth_host.BindNewEndpointAndPassReceiver()); plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier); @@ -207,7 +207,7 @@ index a6e34d86aa11..1141f02719e9 100644 break; } case chrome::mojom::PluginStatus::kBlocked: { -@@ -1131,7 +1133,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1137,7 +1139,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name)); placeholder->AllowLoading(); RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked")); @@ -217,7 +217,7 @@ index a6e34d86aa11..1141f02719e9 100644 break; } case chrome::mojom::PluginStatus::kBlockedByPolicy: { -@@ -1141,7 +1144,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1147,7 +1150,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( group_name)); RenderThread::Get()->RecordAction( UserMetricsAction("Plugin_BlockedByPolicy")); @@ -227,7 +227,7 @@ index a6e34d86aa11..1141f02719e9 100644 break; } case chrome::mojom::PluginStatus::kBlockedNoLoading: { -@@ -1149,7 +1153,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1155,7 +1159,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( IDR_BLOCKED_PLUGIN_HTML, l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING, group_name)); diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index c8ece2ed6..1c03d73ff 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -62,7 +62,7 @@ index 6e2d09885b45..da23a0211754 100644 #endif diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc -index 38f24359a5a2..3c724e29facb 100644 +index dc4db573977d..489ed518257c 100644 --- content/browser/devtools/devtools_http_handler.cc +++ content/browser/devtools/devtools_http_handler.cc @@ -575,7 +575,7 @@ void DevToolsHttpHandler::OnJsonRequest( @@ -188,10 +188,10 @@ index 632ae86c6fd6..55b749ec1242 100644 const std::vector& all_plugins); diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index ee638fbd09ad..ef1a5567a0fa 100644 +index 4f87e25cc2e5..b6ce02f290b1 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -11960,6 +11960,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( +@@ -11989,6 +11989,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( } void RenderFrameHostImpl::GetPluginInfo(const GURL& url, @@ -199,7 +199,7 @@ index ee638fbd09ad..ef1a5567a0fa 100644 const url::Origin& main_frame_origin, const std::string& mime_type, GetPluginInfoCallback callback) { -@@ -11967,7 +11968,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, +@@ -11996,7 +11997,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, WebPluginInfo info; std::string actual_mime_type; bool found = PluginServiceImpl::GetInstance()->GetPluginInfo( @@ -210,10 +210,10 @@ index ee638fbd09ad..ef1a5567a0fa 100644 std::move(callback).Run(found, info, actual_mime_type); } diff --git content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_impl.h -index e63f3085b846..f2a4cf1f37ef 100644 +index f67902441798..c5a0be030b00 100644 --- content/browser/renderer_host/render_frame_host_impl.h +++ content/browser/renderer_host/render_frame_host_impl.h -@@ -2531,6 +2531,7 @@ class CONTENT_EXPORT RenderFrameHostImpl +@@ -2535,6 +2535,7 @@ class CONTENT_EXPORT RenderFrameHostImpl int32_t plugin_child_id, const base::FilePath& path) override; void GetPluginInfo(const GURL& url, @@ -334,10 +334,10 @@ index 7ec0901cf6ba..db5b5529a4cd 100644 // started. virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 5f7a44233f04..4667ca90a8f2 100644 +index c8139a90c462..67bc19479ff0 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -3309,7 +3309,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( +@@ -3314,7 +3314,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( WebPluginInfo info; std::string mime_type; bool found = false; diff --git a/patch/patches/trace_event.patch b/patch/patches/trace_event.patch index 13feb9933..442d0e5e9 100644 --- a/patch/patches/trace_event.patch +++ b/patch/patches/trace_event.patch @@ -1,5 +1,5 @@ diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h -index a9616406d4d3..178e4bdad971 100644 +index bb47926b3d3e..84a9e6b9d953 100644 --- base/trace_event/builtin_categories.h +++ base/trace_event/builtin_categories.h @@ -61,6 +61,8 @@ diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 9add95fd7..26d44dc30 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -130,7 +130,7 @@ index 2486758e7911..3ef43f47b62e 100644 // Set the view's active state (i.e., tint state of controls). virtual void SetActive(bool active) = 0; diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc -index 55eab0cb3732..3f26f85feaef 100644 +index c3b1703f5d97..c0c6500cf8e5 100644 --- ui/platform_window/x11/x11_window.cc +++ ui/platform_window/x11/x11_window.cc @@ -1660,7 +1660,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {