From 53d4ce97ccb902ef352a9c73320b95c0d2b8d602 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 5 May 2022 14:44:36 +0000 Subject: [PATCH] Update to Chromium version 102.0.5005.40 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- .../browser_security_policy_1081397.patch | 6 ++--- patch/patches/chrome_runtime.patch | 6 ++--- patch/patches/chrome_runtime_views.patch | 24 +++++++++---------- patch/patches/embedder_product_override.patch | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 1bf27904b..6df3943f8 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/102.0.5005.27', + 'chromium_checkout': 'refs/tags/102.0.5005.40', 'depot_tools_checkout': '583ca66091' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index c55b2d0c9..8218a055b 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index f5b91aa9fc965..65319cceb358c 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 06f3689531f53..393dd4e2f1db2 100644 +index 6291945b8640e..0c58033955896 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -6189,6 +6189,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( +@@ -6190,6 +6190,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 06f3689531f53..393dd4e2f1db2 100644 // Apply sandbox flags. // See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag -@@ -6222,6 +6228,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { +@@ -6223,6 +6229,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { if (IsSameDocument() || IsPageActivation()) return GetRenderFrameHost()->GetLastCommittedOrigin(); diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 0a4911567..9f5734e41 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -296,7 +296,7 @@ index f0415a5099cdf..b37813c8c43e0 100644 #endif diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc -index c2f47de7f3d15..ca406616ebeec 100644 +index 1a660729062c0..a4311a3cb557b 100644 --- chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc @@ -11,6 +11,7 @@ @@ -307,7 +307,7 @@ index c2f47de7f3d15..ca406616ebeec 100644 #include "chrome/browser/about_flags.h" #include "chrome/browser/accessibility/accessibility_labels_service.h" #include "chrome/browser/accessibility/accessibility_ui.h" -@@ -163,6 +164,10 @@ +@@ -164,6 +165,10 @@ #include "chrome/browser/background/background_mode_manager.h" #endif @@ -318,7 +318,7 @@ index c2f47de7f3d15..ca406616ebeec 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h" -@@ -1300,6 +1305,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1302,6 +1307,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, SessionDataService::RegisterProfilePrefs(registry); #endif diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index de9efeb33..9178df8fd 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -180,7 +180,7 @@ index d42661a633fcd..85b03452d4dc3 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 ce0286c8ec074..fb3c16fa81bf3 100644 +index e80efca66099f..25cf89f37b299 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -305,11 +305,10 @@ using content::WebContents; @@ -198,7 +198,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 #if BUILDFLAG(IS_CHROMEOS_ASH) // UMA histograms that record animation smoothness for tab loading animation. -@@ -798,11 +797,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver { +@@ -801,11 +800,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver { /////////////////////////////////////////////////////////////////////////////// // BrowserView, public: @@ -222,7 +222,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 SetShowIcon( ::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay())); -@@ -837,7 +847,6 @@ BrowserView::BrowserView(std::unique_ptr browser) +@@ -840,7 +850,6 @@ BrowserView::BrowserView(std::unique_ptr browser) } browser_->tab_strip_model()->AddObserver(this); @@ -230,7 +230,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 // Top container holds tab strip region and toolbar and lives at the front of // the view hierarchy. -@@ -880,8 +889,15 @@ BrowserView::BrowserView(std::unique_ptr browser) +@@ -883,8 +892,15 @@ BrowserView::BrowserView(std::unique_ptr browser) contents_container->SetLayoutManager(std::make_unique( devtools_web_view_, contents_web_view_)); @@ -248,7 +248,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 contents_separator_ = top_container_->AddChildView(std::make_unique()); -@@ -1769,6 +1785,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { +@@ -1772,6 +1788,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { if (immersive_mode_controller_->IsEnabled()) return false; @@ -257,7 +257,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); } -@@ -2977,7 +2995,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { +@@ -2980,7 +2998,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { } void BrowserView::ReparentTopContainerForEndOfImmersive() { @@ -267,7 +267,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -3518,8 +3537,10 @@ void BrowserView::Layout() { +@@ -3521,8 +3540,10 @@ void BrowserView::Layout() { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -280,7 +280,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -3585,6 +3606,11 @@ void BrowserView::AddedToWidget() { +@@ -3588,6 +3609,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -292,7 +292,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 toolbar_->Init(); // TODO(pbos): Manage this either inside SidePanel or the corresponding button -@@ -3648,13 +3674,9 @@ void BrowserView::AddedToWidget() { +@@ -3651,13 +3677,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -308,7 +308,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 using_native_frame_ = frame_->ShouldUseNativeFrame(); MaybeInitializeWebUITabStrip(); -@@ -4082,7 +4104,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, +@@ -4085,7 +4107,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, // Undo our anti-jankiness hacks and force a re-layout. in_process_fullscreen_ = false; ToolbarSizeChanged(false); @@ -318,7 +318,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 } bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { -@@ -4409,6 +4432,8 @@ Profile* BrowserView::GetProfile() { +@@ -4412,6 +4435,8 @@ Profile* BrowserView::GetProfile() { } void BrowserView::UpdateUIForTabFullscreen() { @@ -327,7 +327,7 @@ index ce0286c8ec074..fb3c16fa81bf3 100644 frame()->GetFrameView()->UpdateFullscreenTopUI(); } -@@ -4431,6 +4456,8 @@ void BrowserView::HideDownloadShelf() { +@@ -4434,6 +4459,8 @@ void BrowserView::HideDownloadShelf() { } bool BrowserView::CanUserExitFullscreen() const { diff --git a/patch/patches/embedder_product_override.patch b/patch/patches/embedder_product_override.patch index 5503492ba..a8b0fb135 100644 --- a/patch/patches/embedder_product_override.patch +++ b/patch/patches/embedder_product_override.patch @@ -1,5 +1,5 @@ diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc -index 7af5de1f3fda5..9b291ee80c1d6 100644 +index 16bc7f1bc774a..93687c034766d 100644 --- components/embedder_support/user_agent_utils.cc +++ components/embedder_support/user_agent_utils.cc @@ -15,6 +15,7 @@