From 6a08ff162a2ebadad7746fcc172e05b1a43482a3 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 18 Aug 2022 13:09:54 +0000 Subject: [PATCH] Update to Chromium version 105.0.5195.37 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_plugins.patch | 2 +- patch/patches/chrome_runtime.patch | 18 +++++++++--------- patch/patches/services_network_2622.patch | 2 +- patch/patches/views_widget.patch | 8 ++++---- patch/patches/webkit_popups.patch | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 68e5f397c..57ac6e651 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/105.0.5195.28', + 'chromium_checkout': 'refs/tags/105.0.5195.37', 'depot_tools_checkout': '882f1e2a9a' } diff --git a/patch/patches/chrome_plugins.patch b/patch/patches/chrome_plugins.patch index 2b96f4bdf..8c2447d29 100644 --- a/patch/patches/chrome_plugins.patch +++ b/patch/patches/chrome_plugins.patch @@ -125,7 +125,7 @@ index 8b72897491669..546919dd70afc 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 bbfb9e5e65480..aa5e4ad3cb17d 100644 +index 0cc423db56e00..1db7d34422d7f 100644 --- chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc @@ -946,6 +946,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 2f26f910a..880273a93 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -174,7 +174,7 @@ index 7ef669d52b306..8edc1aaeaff6a 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index c96f6885207ad..ca39c737b20dd 100644 +index e53e21fb50f51..38bb4189b21c6 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -31,6 +31,7 @@ @@ -185,7 +185,7 @@ index c96f6885207ad..ca39c737b20dd 100644 #include "chrome/browser/accessibility/accessibility_labels_service.h" #include "chrome/browser/accessibility/accessibility_labels_service_factory.h" #include "chrome/browser/after_startup_task_utils.h" -@@ -1347,6 +1348,8 @@ bool DoesGaiaOriginRequireDedicatedProcess() { +@@ -1349,6 +1350,8 @@ bool DoesGaiaOriginRequireDedicatedProcess() { } // namespace ChromeContentBrowserClient::ChromeContentBrowserClient() { @@ -194,7 +194,7 @@ index c96f6885207ad..ca39c737b20dd 100644 #if BUILDFLAG(ENABLE_PLUGINS) extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart); #endif -@@ -1372,6 +1375,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { +@@ -1374,6 +1377,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { extra_parts_.clear(); } @@ -206,7 +206,7 @@ index c96f6885207ad..ca39c737b20dd 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -3902,9 +3910,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -3908,9 +3916,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -218,7 +218,7 @@ index c96f6885207ad..ca39c737b20dd 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -5576,7 +5586,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -5582,7 +5592,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( network_service); } @@ -227,7 +227,7 @@ index c96f6885207ad..ca39c737b20dd 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -5594,6 +5604,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -5600,6 +5610,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -236,7 +236,7 @@ index c96f6885207ad..ca39c737b20dd 100644 } std::vector -@@ -6446,10 +6458,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -6452,10 +6464,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -249,7 +249,7 @@ index c96f6885207ad..ca39c737b20dd 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -6468,7 +6480,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -6474,7 +6486,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -259,7 +259,7 @@ index c96f6885207ad..ca39c737b20dd 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -6593,7 +6606,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -6599,7 +6612,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index c53de751b..21f486118 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -42,7 +42,7 @@ index 5f13af8dd54be..3a2ca5e918889 100644 ::network::mojom::NetworkContextFilePaths::New(); diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc -index 644e5fc13712a..51e6c0c24ff30 100644 +index 9be287c8dac49..48bbcb9167eac 100644 --- net/cookies/cookie_monster.cc +++ net/cookies/cookie_monster.cc @@ -540,6 +540,25 @@ void CookieMonster::SetCookieableSchemes( diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 69d3d0bf1..297184047 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -18,7 +18,7 @@ index eefdd87f1f85a..4f4c68e53676d 100644 if (!GetMouseWheelPhaseHandler()) return; diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h -index 4174581cda568..34cc936cbc305 100644 +index 763c624ec75e6..274f2120ebfd4 100644 --- content/browser/renderer_host/render_widget_host_view_base.h +++ content/browser/renderer_host/render_widget_host_view_base.h @@ -67,6 +67,7 @@ class CursorManager; @@ -49,7 +49,7 @@ index 4174581cda568..34cc936cbc305 100644 // Called by the TextInputManager to notify the view about being removed from // the list of registered views, i.e., TextInputManager is no longer tracking // TextInputState from this view. The RWHV should reset |text_input_manager_| -@@ -425,6 +432,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView { +@@ -428,6 +435,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView { const gfx::Rect& bounds, const gfx::Rect& anchor_rect) = 0; @@ -62,7 +62,7 @@ index 4174581cda568..34cc936cbc305 100644 // Sets the cursor for this view to the one associated with the specified // cursor_type. virtual void UpdateCursor(const WebCursor& cursor) = 0; -@@ -667,6 +680,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView { +@@ -670,6 +683,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView { // to all displays. gfx::Size system_cursor_size_; @@ -73,7 +73,7 @@ index 4174581cda568..34cc936cbc305 100644 private: FRIEND_TEST_ALL_PREFIXES( BrowserSideFlingBrowserTest, -@@ -688,10 +705,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView { +@@ -691,10 +708,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView { void SynchronizeVisualProperties(); diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 98dc37903..60f4e237a 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -62,7 +62,7 @@ index ce3a483a4c06d..834cbe13415d0 100644 TransformationMatrix device_emulation_transform_; diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc -index c3efeb47aec53..9927b7709134d 100644 +index bfbfe6c37d969..3046087066a66 100644 --- third_party/blink/renderer/core/page/chrome_client_impl.cc +++ third_party/blink/renderer/core/page/chrome_client_impl.cc @@ -913,7 +913,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {