From 7111d35d3c0e884e035bb5d6b68ad60453d3c4c0 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 22 Nov 2021 15:27:08 +0000 Subject: [PATCH] Update to Chromium version 97.0.4692.20 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/browser_security_policy_1081397.patch | 6 +++--- patch/patches/chrome_browser.patch | 2 +- patch/patches/chrome_runtime_views.patch | 4 ++-- patch/patches/resource_bundle_2512.patch | 6 +++--- patch/patches/views_widget.patch | 4 ++-- patch/patches/web_contents_1257_1565.patch | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index b9416615f..ccfc0c161 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/97.0.4692.8', + 'chromium_checkout': 'refs/tags/97.0.4692.20', 'depot_tools_checkout': 'f7b8f8f3cd' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index b1149f329..de73a27f7 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index 85a68f06ccc71..a57f47d70084b 100644 // TODO(wjmaclean): We should update the ProcessLock comparison API diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc -index 75c69841ae368..5f3f082c8775d 100644 +index 3a5aa8aa5f82a..936dd8da4c572 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -5793,6 +5793,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( +@@ -5832,6 +5832,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( network::mojom::WebSandboxFlags sandbox_flags) { // Calculate an approximation of the origin. The sandbox/csp are ignored. url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this); @@ -36,7 +36,7 @@ index 75c69841ae368..5f3f082c8775d 100644 // Apply sandbox flags. // See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag -@@ -5826,6 +5832,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { +@@ -5865,6 +5871,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { if (IsSameDocument() || IsPageActivation()) return GetRenderFrameHost()->GetLastCommittedOrigin(); diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index e83c5c349..2aacf36d1 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 803485153c7fb..f334eccf6bd13 100644 +index ff1567db95bbb..76b942142f854 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -13,6 +13,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 2ca6b5d2f..4ebae11f2 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -129,7 +129,7 @@ index d32af8b258530..b883d7204ecec 100644 BrowserFrame(const BrowserFrame&) = delete; BrowserFrame& operator=(const BrowserFrame&) = delete; diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc -index 2fd995c53c6c7..ab53c371ff540 100644 +index 47ce6ac46dae4..67e6252176524 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -290,11 +290,10 @@ using content::WebContents; @@ -241,7 +241,7 @@ index 2fd995c53c6c7..ab53c371ff540 100644 toolbar_->Init(); // TODO(pbos): Manage this either inside SidePanel or the corresponding button -@@ -3313,13 +3339,9 @@ void BrowserView::AddedToWidget() { +@@ -3317,13 +3343,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); diff --git a/patch/patches/resource_bundle_2512.patch b/patch/patches/resource_bundle_2512.patch index d388099a6..72e2a693d 100644 --- a/patch/patches/resource_bundle_2512.patch +++ b/patch/patches/resource_bundle_2512.patch @@ -1,8 +1,8 @@ diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc -index 1b4d235071561..e5c795b4ab0b7 100644 +index c51808ac3f092..a33990151afe9 100644 --- ui/base/resource/resource_bundle.cc +++ ui/base/resource/resource_bundle.cc -@@ -890,6 +890,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate) +@@ -891,6 +891,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate) : delegate_(delegate), locale_resources_data_lock_(new base::Lock), max_scale_factor_(k100Percent) { @@ -15,7 +15,7 @@ index 1b4d235071561..e5c795b4ab0b7 100644 mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kMangleLocalizedStrings); } -@@ -899,6 +905,11 @@ ResourceBundle::~ResourceBundle() { +@@ -900,6 +906,11 @@ ResourceBundle::~ResourceBundle() { UnloadLocaleResources(); } diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index ab54ca943..370c1f55a 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -152,10 +152,10 @@ index adcf1eeaa3574..0748d570624cd 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 dd416c031e7c1..05c05ac20f6b6 100644 +index a47c7c48dc67f..87ac5cf77cb49 100644 --- ui/platform_window/x11/x11_window.cc +++ ui/platform_window/x11/x11_window.cc -@@ -1689,7 +1689,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) { +@@ -1704,7 +1704,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) { req.border_pixel = 0; bounds_in_pixels_ = SanitizeBounds(bounds); diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index cbafb051b..0237b8bd4 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index a13a133be6428..903612fec96d8 100644 +index 42ab782017f84..9ae93e12cbe6c 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -2959,6 +2959,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -39,7 +39,7 @@ index a13a133be6428..903612fec96d8 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -7675,6 +7691,8 @@ void WebContentsImpl::OnAdvanceFocus(RenderFrameHostImpl* source_rfh) { +@@ -7682,6 +7698,8 @@ void WebContentsImpl::OnAdvanceFocus(RenderFrameHostImpl* source_rfh) { GetFocusedWebContents() == GetOuterWebContents()) { SetAsFocusedWebContentsIfNecessary(); }