From b3fe8ad6d7570acdffb47e1e01ceff8f9b7277bb Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 20 Feb 2025 14:29:57 +0000 Subject: [PATCH] Update to Chromium version 134.0.6998.23 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- .../chrome_browser_permission_prompt.patch | 4 +- patch/patches/chrome_runtime_views.patch | 42 +++++++++---------- patch/patches/gritsettings.patch | 4 +- patch/patches/osr_fling_2745.patch | 6 +-- patch/patches/rfh_navigation_4829483.patch | 6 +-- patch/patches/rwh_background_color_1984.patch | 2 +- patch/patches/views_widget.patch | 16 +++---- patch/patches/web_contents_1257_1565.patch | 4 +- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 1ef70b2d6..cc0da2cd3 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/134.0.6998.15' + 'chromium_checkout': 'refs/tags/134.0.6998.23' } diff --git a/patch/patches/chrome_browser_permission_prompt.patch b/patch/patches/chrome_browser_permission_prompt.patch index 00509182c..0af388740 100644 --- a/patch/patches/chrome_browser_permission_prompt.patch +++ b/patch/patches/chrome_browser_permission_prompt.patch @@ -17,10 +17,10 @@ index fbce13c16ad10..0512b2f09937e 100644 std::unique_ptr CreatePermissionPrompt( content::WebContents* web_contents, diff --git chrome/browser/ui/views/permissions/permission_prompt_factory.cc chrome/browser/ui/views/permissions/permission_prompt_factory.cc -index 0f19f3eeeea54..20a942f2e4007 100644 +index ab9701eb9ce8c..7c1dbe9adb0e8 100644 --- chrome/browser/ui/views/permissions/permission_prompt_factory.cc +++ chrome/browser/ui/views/permissions/permission_prompt_factory.cc -@@ -209,11 +209,28 @@ std::unique_ptr CreateQuietPrompt( +@@ -210,11 +210,28 @@ std::unique_ptr CreateQuietPrompt( } } diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index abd058f5e..ca2b12147 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -397,10 +397,10 @@ index 3d8a15049d4d2..66c4789581fe1 100644 // regenerated. bool RegenerateFrameOnThemeChange(BrowserThemeChangeType theme_change_type); diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc -index 127aa3ef3ba70..506cb33978bed 100644 +index 76c889780c153..80e31b0c2986b 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -363,10 +363,6 @@ using web_modal::WebContentsModalDialogHost; +@@ -364,10 +364,6 @@ using web_modal::WebContentsModalDialogHost; namespace { @@ -411,7 +411,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 #if BUILDFLAG(IS_CHROMEOS) // UMA histograms that record animation smoothness for tab loading animation. constexpr char kTabLoadingSmoothnessHistogramName[] = -@@ -776,6 +772,14 @@ class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate { +@@ -777,6 +773,14 @@ class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate { return browser_view_->frame()->GetTopInset() - browser_view_->y(); } @@ -426,7 +426,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 bool IsToolbarVisible() const override { return browser_view_->IsToolbarVisible(); } -@@ -927,11 +931,21 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver { +@@ -928,11 +932,21 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver { /////////////////////////////////////////////////////////////////////////////// // BrowserView, public: @@ -449,7 +449,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 SetShowIcon(::ShouldShowWindowIcon( browser_.get(), AppUsesWindowControlsOverlay(), AppUsesTabbed())); -@@ -1071,8 +1085,15 @@ BrowserView::BrowserView(std::unique_ptr browser) +@@ -1072,8 +1086,15 @@ BrowserView::BrowserView(std::unique_ptr browser) watermark_view_)); #endif @@ -467,7 +467,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 contents_separator_ = top_container_->AddChildView(std::make_unique()); -@@ -1144,7 +1165,9 @@ BrowserView::BrowserView(std::unique_ptr browser) +@@ -1145,7 +1166,9 @@ BrowserView::BrowserView(std::unique_ptr browser) } BrowserView::~BrowserView() { @@ -477,7 +477,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 // Remove the layout manager to avoid dangling. This needs to be earlier than // other cleanups that destroy views referenced in the layout manager. -@@ -1156,7 +1179,9 @@ BrowserView::~BrowserView() { +@@ -1157,7 +1180,9 @@ BrowserView::~BrowserView() { // All the tabs should have been destroyed already. If we were closed by the // OS with some tabs than the NativeBrowserFrame should have destroyed them. @@ -487,7 +487,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 // Stop the animation timer explicitly here to avoid running it in a nested // message loop, which may run by Browser destructor. -@@ -1165,17 +1190,18 @@ BrowserView::~BrowserView() { +@@ -1166,17 +1191,18 @@ BrowserView::~BrowserView() { // Immersive mode may need to reparent views before they are removed/deleted. immersive_mode_controller_.reset(); @@ -510,7 +510,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 // These are raw pointers to child views, so they need to be set to null // before `RemoveAllChildViews()` is called to avoid dangling. -@@ -1800,6 +1826,28 @@ gfx::Point BrowserView::GetThemeOffsetFromBrowserView() const { +@@ -1801,6 +1827,28 @@ gfx::Point BrowserView::GetThemeOffsetFromBrowserView() const { ThemeProperties::kFrameHeightAboveTabs - browser_view_origin.y()); } @@ -539,7 +539,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 // static: BrowserView::DevToolsDockedPlacement BrowserView::GetDevToolsDockedPlacement( const gfx::Rect& contents_webview_bounds, -@@ -2220,7 +2268,13 @@ void BrowserView::OnExclusiveAccessUserInput() { +@@ -2221,7 +2269,13 @@ void BrowserView::OnExclusiveAccessUserInput() { bool BrowserView::ShouldHideUIForFullscreen() const { // Immersive mode needs UI for the slide-down top panel. @@ -554,7 +554,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 return false; } -@@ -3459,7 +3513,9 @@ DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() { +@@ -3460,7 +3514,9 @@ DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() { } return nullptr; } @@ -565,7 +565,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 if (auto* download_button = toolbar_button_provider_->GetDownloadButton()) { return download_button->bubble_controller(); } -@@ -4089,7 +4145,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { +@@ -4094,7 +4150,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { return; } @@ -575,7 +575,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -4607,11 +4664,38 @@ void BrowserView::GetAccessiblePanes(std::vector* panes) { +@@ -4612,11 +4669,38 @@ void BrowserView::GetAccessiblePanes(std::vector* panes) { bool BrowserView::ShouldDescendIntoChildForEventHandling( gfx::NativeView child, const gfx::Point& location) { @@ -616,7 +616,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 // Draggable regions are defined relative to the web contents. gfx::Point point_in_contents_web_view_coords(location); views::View::ConvertPointToTarget(GetWidget()->GetRootView(), -@@ -4620,7 +4704,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling( +@@ -4625,7 +4709,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling( // Draggable regions should be ignored for clicks into any browser view's // owned widgets, for example alerts, permission prompts or find bar. @@ -625,7 +625,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 point_in_contents_web_view_coords.x(), point_in_contents_web_view_coords.y()) || WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords); -@@ -4734,8 +4818,10 @@ void BrowserView::Layout(PassKey) { +@@ -4739,8 +4823,10 @@ void BrowserView::Layout(PassKey) { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -638,7 +638,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -4802,6 +4888,11 @@ void BrowserView::AddedToWidget() { +@@ -4807,6 +4893,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -650,7 +650,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 toolbar_->Init(); if (download::IsDownloadBubbleEnabled() && features::IsToolbarPinningEnabled() && -@@ -4849,14 +4940,10 @@ void BrowserView::AddedToWidget() { +@@ -4854,14 +4945,10 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -668,7 +668,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 using_native_frame_ = frame_->ShouldUseNativeFrame(); MaybeInitializeWebUITabStrip(); -@@ -5252,7 +5339,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, const int64_t display_id) { +@@ -5257,7 +5344,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, const int64_t display_id) { // Undo our anti-jankiness hacks and force a re-layout. in_process_fullscreen_ = false; ToolbarSizeChanged(false); @@ -678,7 +678,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 } void BrowserView::RequestFullscreen(bool fullscreen, int64_t display_id) { -@@ -5748,6 +5836,8 @@ Profile* BrowserView::GetProfile() { +@@ -5753,6 +5841,8 @@ Profile* BrowserView::GetProfile() { } void BrowserView::UpdateUIForTabFullscreen() { @@ -687,7 +687,7 @@ index 127aa3ef3ba70..506cb33978bed 100644 frame()->GetFrameView()->UpdateFullscreenTopUI(); } -@@ -5777,6 +5867,8 @@ bool BrowserView::CanUserEnterFullscreen() const { +@@ -5782,6 +5872,8 @@ bool BrowserView::CanUserEnterFullscreen() const { } bool BrowserView::CanUserExitFullscreen() const { @@ -738,7 +738,7 @@ index b9986c6e9097d..fc8f781e6ac66 100644 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate // interface to keep these two classes decoupled and testable. diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc -index 1376fdf933420..336391e29944c 100644 +index 46f6be18ac556..be2ce4a9dc6da 100644 --- chrome/browser/ui/views/frame/browser_view_layout.cc +++ chrome/browser/ui/views/frame/browser_view_layout.cc @@ -52,6 +52,10 @@ diff --git a/patch/patches/gritsettings.patch b/patch/patches/gritsettings.patch index 7b3f9220a..08fd97756 100644 --- a/patch/patches/gritsettings.patch +++ b/patch/patches/gritsettings.patch @@ -1,8 +1,8 @@ diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec -index 60e844376f968..b282af990a75a 100644 +index 80494b5bb318a..61ed661f2a80a 100644 --- tools/gritsettings/resource_ids.spec +++ tools/gritsettings/resource_ids.spec -@@ -1461,11 +1461,18 @@ +@@ -1463,11 +1463,18 @@ "<(SHARED_INTERMEDIATE_DIR)/third_party/blink/public/strings/permission_element_generated_strings.grd": { "META": {"sizes": {"messages": [2000],}}, "messages": [10080], diff --git a/patch/patches/osr_fling_2745.patch b/patch/patches/osr_fling_2745.patch index 06e50da65..2c3068d9f 100644 --- a/patch/patches/osr_fling_2745.patch +++ b/patch/patches/osr_fling_2745.patch @@ -56,7 +56,7 @@ index f1030a744809c..c222a209949e6 100644 return nullptr; } diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc -index be489f36aa63d..b5a60cf8f515d 100644 +index 734e717d2cc5c..6690432edf9f6 100644 --- content/browser/renderer_host/render_widget_host_impl.cc +++ content/browser/renderer_host/render_widget_host_impl.cc @@ -801,7 +801,7 @@ void RenderWidgetHostImpl::WasHidden() { @@ -68,7 +68,7 @@ index be489f36aa63d..b5a60cf8f515d 100644 RejectPointerLockOrUnlockIfNecessary( blink::mojom::PointerLockResult::kWrongDocument); } -@@ -3684,6 +3684,11 @@ void RenderWidgetHostImpl::StopFling() { +@@ -3685,6 +3685,11 @@ void RenderWidgetHostImpl::StopFling() { GetRenderInputRouter()->StopFling(); } @@ -81,7 +81,7 @@ index be489f36aa63d..b5a60cf8f515d 100644 uint16_t angle, display::mojom::ScreenOrientation type) { diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h -index 9aaac362d0b38..37c54dd78ffea 100644 +index c3429732757d8..09c7d25c1ba66 100644 --- content/browser/renderer_host/render_widget_host_impl.h +++ content/browser/renderer_host/render_widget_host_impl.h @@ -838,6 +838,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index fa51215ad..51d0dd3c8 100644 --- a/patch/patches/rfh_navigation_4829483.patch +++ b/patch/patches/rfh_navigation_4829483.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index 3d288f59adc60..db56834a946a8 100644 +index 622142dcf64df..3648e7e38b9c1 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -9610,6 +9610,16 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9615,6 +9615,16 @@ void RenderFrameHostImpl::CreateNewWindow( return; } @@ -19,7 +19,7 @@ index 3d288f59adc60..db56834a946a8 100644 // Otherwise, consume user activation before we proceed. In particular, it is // important to do this before we return from the |opener_suppressed| case // below. -@@ -11987,6 +11997,7 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -11992,6 +12002,7 @@ void RenderFrameHostImpl::CommitNavigation( auto browser_calc_origin_to_commit = navigation_request->GetOriginToCommitWithDebugInfo(); if (!process_lock.is_error_page() && !is_mhtml_subframe && diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index 5f7906a32..f7d74cb33 100644 --- a/patch/patches/rwh_background_color_1984.patch +++ b/patch/patches/rwh_background_color_1984.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc -index 48e8a414e0b71..2aa27eb74160b 100644 +index 1d08f25b91496..ecac98345a92c 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -6,6 +6,7 @@ diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 4f33270e4..e8971730e 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -80,7 +80,7 @@ index fc70d927f9692..ae66251a93264 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 581a829a37786..820fb97508ea2 100644 +index deb5325b14ef8..5f5cbf472adf9 100644 --- content/browser/renderer_host/render_widget_host_view_base.h +++ content/browser/renderer_host/render_widget_host_view_base.h @@ -70,6 +70,7 @@ namespace content { @@ -125,7 +125,7 @@ index 581a829a37786..820fb97508ea2 100644 // Indicates whether the page has finished loading. virtual void SetIsLoading(bool is_loading) = 0; -@@ -596,6 +610,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase +@@ -599,6 +613,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase // to all displays. gfx::Size system_cursor_size_; @@ -136,7 +136,7 @@ index 581a829a37786..820fb97508ea2 100644 private: FRIEND_TEST_ALL_PREFIXES( BrowserSideFlingBrowserTest, -@@ -617,10 +635,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase +@@ -620,10 +638,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase void SynchronizeVisualProperties(); @@ -500,10 +500,10 @@ index 932351e288f37..7897f4b72f605 100644 // the implementation of ::ShowCursor() is based on a counter, so making this // member static ensures that ::ShowCursor() is always called exactly once diff --git ui/views/widget/native_widget_mac.mm ui/views/widget/native_widget_mac.mm -index 89247a9ed3522..2d997ff8fda51 100644 +index a616400ddaa71..90d424a854c13 100644 --- ui/views/widget/native_widget_mac.mm +++ ui/views/widget/native_widget_mac.mm -@@ -699,6 +699,7 @@ void NativeWidgetMac::Show(ui::mojom::WindowShowState show_state, +@@ -702,6 +702,7 @@ void NativeWidgetMac::Show(ui::mojom::WindowShowState show_state, break; case ui::mojom::WindowShowState::kMaximized: case ui::mojom::WindowShowState::kFullscreen: @@ -512,7 +512,7 @@ index 89247a9ed3522..2d997ff8fda51 100644 break; case ui::mojom::WindowShowState::kEnd: diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc -index a4c1dba98b0d2..b8f9b62260637 100644 +index 6853d63ce96bd..1327b1e3cbaac 100644 --- ui/views/widget/widget.cc +++ ui/views/widget/widget.cc @@ -234,8 +234,8 @@ bool Widget::InitParams::ShouldInitAsHeadless() const { @@ -565,7 +565,7 @@ index a4c1dba98b0d2..b8f9b62260637 100644 } } -@@ -1922,10 +1933,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) { +@@ -1923,10 +1934,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) { } gfx::Size Widget::GetMinimumSize() const { @@ -582,7 +582,7 @@ index a4c1dba98b0d2..b8f9b62260637 100644 return non_client_view_ ? non_client_view_->GetMaximumSize() : gfx::Size(); } -@@ -2206,7 +2223,8 @@ bool Widget::SetInitialFocus(ui::mojom::WindowShowState show_state) { +@@ -2207,7 +2224,8 @@ bool Widget::SetInitialFocus(ui::mojom::WindowShowState show_state) { View* v = widget_delegate_->GetInitiallyFocusedView(); if (!focus_on_creation_ || show_state == ui::mojom::WindowShowState::kInactive || diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 7c8365f04..5c9e9aec6 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 5ff43afce429c..587130d6d4f2a 100644 +index 94917dc412682..308bcea0b770d 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -3830,6 +3830,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -60,7 +60,7 @@ index 5ff43afce429c..587130d6d4f2a 100644 FrameTree* WebContentsImpl::GetOwnedPictureInPictureFrameTree() { diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h -index 5e89cbf0ed5fd..49a6449c46fad 100644 +index 24afa41509bec..560f83dea80de 100644 --- content/public/browser/web_contents.h +++ content/public/browser/web_contents.h @@ -116,10 +116,12 @@ class BrowserPluginGuestDelegate;