diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 0992163dc..b0d9326eb 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/131.0.6778.109' + 'chromium_checkout': 'refs/tags/131.0.6778.140' } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index f01053d0e..10e2350a2 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 54279426733f7..435dc352ca0f5 100644 +index 8aa3f2bd53970..17eace191e566 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/compiler/pgo/pgo.gni") diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 592515c20..29d7e885d 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -138,7 +138,7 @@ index 4c9e41d73cedd..eed762cd05bf9 100644 ] } diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc -index df205a82b34c4..888f9c4dc3035 100644 +index 3ea7f6115a0e5..df9e31681ec7c 100644 --- chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc @@ -272,6 +272,25 @@ @@ -191,7 +191,7 @@ index df205a82b34c4..888f9c4dc3035 100644 } /////////////////////////////////////////////////////////////////////////////// -@@ -1327,6 +1356,8 @@ void Browser::WindowFullscreenStateChanged() { +@@ -1316,6 +1345,8 @@ void Browser::WindowFullscreenStateChanged() { ->WindowFullscreenStateChanged(); command_controller_->FullscreenStateChanged(); UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN); @@ -200,7 +200,7 @@ index df205a82b34c4..888f9c4dc3035 100644 } void Browser::FullscreenTopUIStateChanged() { -@@ -1646,6 +1677,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( +@@ -1635,6 +1666,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( if (exclusive_access_manager_->HandleUserKeyEvent(event)) return content::KeyboardEventProcessingResult::HANDLED; @@ -215,7 +215,7 @@ index df205a82b34c4..888f9c4dc3035 100644 return window()->PreHandleKeyboardEvent(event); } -@@ -1653,8 +1692,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, +@@ -1642,8 +1681,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, const NativeWebKeyboardEvent& event) { DevToolsWindow* devtools_window = DevToolsWindow::GetInstanceForInspectedWebContents(source); @@ -236,7 +236,7 @@ index df205a82b34c4..888f9c4dc3035 100644 } bool Browser::TabsNeedBeforeUnloadFired() const { -@@ -1747,9 +1796,14 @@ bool Browser::IsBackForwardCacheSupported(content::WebContents& web_contents) { +@@ -1736,9 +1785,14 @@ bool Browser::IsBackForwardCacheSupported(content::WebContents& web_contents) { content::PreloadingEligibility Browser::IsPrerender2Supported( content::WebContents& web_contents) { @@ -251,7 +251,7 @@ index df205a82b34c4..888f9c4dc3035 100644 } bool Browser::ShouldShowStaleContentOnEviction(content::WebContents* source) { -@@ -1809,6 +1863,14 @@ WebContents* Browser::OpenURLFromTab( +@@ -1798,6 +1852,14 @@ WebContents* Browser::OpenURLFromTab( std::move(navigation_handle_callback)); } @@ -266,7 +266,7 @@ index df205a82b34c4..888f9c4dc3035 100644 NavigateParams nav_params(this, params.url, params.transition); nav_params.FillNavigateParamsFromOpenURLParams(params); nav_params.source_contents = source; -@@ -1975,6 +2037,8 @@ void Browser::LoadingStateChanged(WebContents* source, +@@ -1964,6 +2026,8 @@ void Browser::LoadingStateChanged(WebContents* source, bool should_show_loading_ui) { ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD); UpdateWindowForLoadingStateChanged(source, should_show_loading_ui); @@ -275,7 +275,7 @@ index df205a82b34c4..888f9c4dc3035 100644 } void Browser::CloseContents(WebContents* source) { -@@ -2003,6 +2067,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { +@@ -1992,6 +2056,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { } void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { @@ -284,7 +284,7 @@ index df205a82b34c4..888f9c4dc3035 100644 if (!GetStatusBubble()) return; -@@ -2010,6 +2076,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { +@@ -1999,6 +2065,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { GetStatusBubble()->SetURL(url); } @@ -302,7 +302,7 @@ index df205a82b34c4..888f9c4dc3035 100644 void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) { const ui::EventType type = event.type(); const bool exited = type == ui::EventType::kMouseExited; -@@ -2038,6 +2115,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { +@@ -2027,6 +2104,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { return false; } @@ -322,7 +322,7 @@ index df205a82b34c4..888f9c4dc3035 100644 void Browser::BeforeUnloadFired(WebContents* web_contents, bool proceed, bool* proceed_to_fire_unload) { -@@ -2137,12 +2227,24 @@ void Browser::WebContentsCreated(WebContents* source_contents, +@@ -2126,12 +2216,24 @@ void Browser::WebContentsCreated(WebContents* source_contents, // Make the tab show up in the task manager. task_manager::WebContentsTags::CreateForTabContents(new_contents); @@ -347,7 +347,7 @@ index df205a82b34c4..888f9c4dc3035 100644 // Don't show the page hung dialog when a HTML popup hangs because // the dialog will take the focus and immediately close the popup. RenderWidgetHostView* view = render_widget_host->GetView(); -@@ -2155,6 +2257,13 @@ void Browser::RendererUnresponsive( +@@ -2144,6 +2246,13 @@ void Browser::RendererUnresponsive( void Browser::RendererResponsive( WebContents* source, content::RenderWidgetHost* render_widget_host) { @@ -361,7 +361,7 @@ index df205a82b34c4..888f9c4dc3035 100644 RenderWidgetHostView* view = render_widget_host->GetView(); if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) { TabDialogs::FromWebContents(source)->HideHungRendererDialog( -@@ -2164,6 +2273,15 @@ void Browser::RendererResponsive( +@@ -2153,6 +2262,15 @@ void Browser::RendererResponsive( content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( WebContents* source) { @@ -377,7 +377,7 @@ index df205a82b34c4..888f9c4dc3035 100644 return javascript_dialogs::TabModalDialogManager::FromWebContents(source); } -@@ -2199,6 +2317,11 @@ void Browser::DraggableRegionsChanged( +@@ -2188,6 +2306,11 @@ void Browser::DraggableRegionsChanged( if (app_controller_) { app_controller_->DraggableRegionsChanged(regions, contents); } @@ -389,7 +389,7 @@ index df205a82b34c4..888f9c4dc3035 100644 } void Browser::DidFinishNavigation( -@@ -2279,11 +2402,15 @@ void Browser::EnterFullscreenModeForTab( +@@ -2268,11 +2391,15 @@ void Browser::EnterFullscreenModeForTab( const blink::mojom::FullscreenOptions& options) { exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( requesting_frame, options.display_id); @@ -405,7 +405,7 @@ index df205a82b34c4..888f9c4dc3035 100644 } bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { -@@ -2486,6 +2613,15 @@ void Browser::RequestMediaAccessPermission( +@@ -2475,6 +2602,15 @@ void Browser::RequestMediaAccessPermission( content::WebContents* web_contents, const content::MediaStreamRequest& request, content::MediaResponseCallback callback) { @@ -421,7 +421,7 @@ index df205a82b34c4..888f9c4dc3035 100644 const extensions::Extension* extension = GetExtensionForOrigin(profile_, request.security_origin); MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( -@@ -3046,9 +3182,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { +@@ -3035,9 +3171,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { // Browser, Getters for UI (private): StatusBubble* Browser::GetStatusBubble() { @@ -433,7 +433,7 @@ index df205a82b34c4..888f9c4dc3035 100644 } // We hide the status bar for web apps windows as this matches native -@@ -3056,6 +3193,12 @@ StatusBubble* Browser::GetStatusBubble() { +@@ -3045,6 +3182,12 @@ StatusBubble* Browser::GetStatusBubble() { // mode, as the minimal browser UI includes the status bar. if (web_app::AppBrowserController::IsWebApp(this) && !app_controller()->HasMinimalUiButtons()) { @@ -446,7 +446,7 @@ index df205a82b34c4..888f9c4dc3035 100644 return nullptr; } -@@ -3205,6 +3348,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { +@@ -3194,6 +3337,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); web_contents_collection_.StopObserving(web_contents); } @@ -455,7 +455,7 @@ index df205a82b34c4..888f9c4dc3035 100644 } void Browser::TabDetachedAtImpl(content::WebContents* contents, -@@ -3359,6 +3504,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature( +@@ -3348,6 +3493,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature( bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, bool check_can_support) const { @@ -471,7 +471,7 @@ index df205a82b34c4..888f9c4dc3035 100644 case TYPE_NORMAL: return NormalBrowserSupportsWindowFeature(feature, check_can_support); diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h -index d650375ef1d4d..e3c7758efa53c 100644 +index ff7d70e948c27..f3822e34df4b7 100644 --- chrome/browser/ui/browser.h +++ chrome/browser/ui/browser.h @@ -24,6 +24,7 @@ @@ -536,7 +536,7 @@ index d650375ef1d4d..e3c7758efa53c 100644 // Get the FindBarController for this browser, creating it if it does not // yet exist. FindBarController* GetFindBarController(); -@@ -959,10 +986,18 @@ class Browser : public TabStripModelObserver, +@@ -958,10 +985,18 @@ class Browser : public TabStripModelObserver, void SetContentsBounds(content::WebContents* source, const gfx::Rect& bounds) override; void UpdateTargetURL(content::WebContents* source, const GURL& url) override; @@ -555,7 +555,7 @@ index d650375ef1d4d..e3c7758efa53c 100644 void BeforeUnloadFired(content::WebContents* source, bool proceed, bool* proceed_to_fire_unload) override; -@@ -1299,6 +1334,10 @@ class Browser : public TabStripModelObserver, +@@ -1298,6 +1333,10 @@ class Browser : public TabStripModelObserver, // This Browser's window. raw_ptr window_; @@ -566,7 +566,7 @@ index d650375ef1d4d..e3c7758efa53c 100644 std::unique_ptr const tab_strip_model_delegate_; std::unique_ptr const tab_strip_model_; -@@ -1365,6 +1404,8 @@ class Browser : public TabStripModelObserver, +@@ -1364,6 +1403,8 @@ class Browser : public TabStripModelObserver, const std::string initial_workspace_; bool initial_visible_on_all_workspaces_state_; diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 80da040a3..95f90dce3 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 31f179bf8f410..daa9134a59282 100644 +index eda9a7b2662b1..4142e4bff7c03 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -361,6 +361,18 @@ base::OnceCallback* GetMenuShownCallback() { diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index dc827a226..45401e9f4 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -397,7 +397,7 @@ index 532705a04c47b..0272f27596df6 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 8c08f4c3f10fa..721a7b1d5f136 100644 +index 6b2a34b446ccc..dac6671a44dab 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -366,10 +366,6 @@ constexpr base::FeatureParam kLoadingTabAnimationFrameDelay = { @@ -553,7 +553,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644 if (auto* download_button = toolbar_button_provider_->GetDownloadButton()) return download_button->bubble_controller(); return nullptr; -@@ -3890,7 +3932,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { +@@ -3876,7 +3918,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { if (top_container()->parent() == this) return; @@ -563,7 +563,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -4381,11 +4424,38 @@ void BrowserView::GetAccessiblePanes(std::vector* panes) { +@@ -4367,11 +4410,38 @@ void BrowserView::GetAccessiblePanes(std::vector* panes) { bool BrowserView::ShouldDescendIntoChildForEventHandling( gfx::NativeView child, const gfx::Point& location) { @@ -604,7 +604,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644 // Draggable regions are defined relative to the web contents. gfx::Point point_in_contents_web_view_coords(location); views::View::ConvertPointToTarget(GetWidget()->GetRootView(), -@@ -4394,7 +4464,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling( +@@ -4380,7 +4450,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. @@ -613,7 +613,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644 point_in_contents_web_view_coords.x(), point_in_contents_web_view_coords.y()) || WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords); -@@ -4505,8 +4575,10 @@ void BrowserView::Layout(PassKey) { +@@ -4491,8 +4561,10 @@ void BrowserView::Layout(PassKey) { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -626,7 +626,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -4572,6 +4644,11 @@ void BrowserView::AddedToWidget() { +@@ -4558,6 +4630,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -638,7 +638,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644 toolbar_->Init(); // TODO(pbos): Investigate whether the side panels should be creatable when -@@ -4614,13 +4691,9 @@ void BrowserView::AddedToWidget() { +@@ -4600,13 +4677,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -654,7 +654,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644 using_native_frame_ = frame_->ShouldUseNativeFrame(); MaybeInitializeWebUITabStrip(); -@@ -5006,7 +5079,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, const int64_t display_id) { +@@ -4979,7 +5052,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); @@ -664,7 +664,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644 } void BrowserView::RequestFullscreen(bool fullscreen, int64_t display_id) { -@@ -5512,6 +5586,8 @@ Profile* BrowserView::GetProfile() { +@@ -5485,6 +5559,8 @@ Profile* BrowserView::GetProfile() { } void BrowserView::UpdateUIForTabFullscreen() { @@ -673,7 +673,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644 frame()->GetFrameView()->UpdateFullscreenTopUI(); } -@@ -5534,6 +5610,8 @@ void BrowserView::HideDownloadShelf() { +@@ -5507,6 +5583,8 @@ void BrowserView::HideDownloadShelf() { } bool BrowserView::CanUserExitFullscreen() const { @@ -683,7 +683,7 @@ index 8c08f4c3f10fa..721a7b1d5f136 100644 } diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h -index bdb273f5134b8..2750336aca016 100644 +index b1d6f077fbd42..4a8929a509aaf 100644 --- chrome/browser/ui/views/frame/browser_view.h +++ chrome/browser/ui/views/frame/browser_view.h @@ -139,11 +139,16 @@ class BrowserView : public BrowserWindow, @@ -703,7 +703,7 @@ index bdb273f5134b8..2750336aca016 100644 void set_frame(BrowserFrame* frame) { frame_ = frame; paint_as_active_subscription_ = -@@ -841,6 +846,10 @@ class BrowserView : public BrowserWindow, +@@ -840,6 +845,10 @@ class BrowserView : public BrowserWindow, void Copy(); void Paste(); @@ -714,7 +714,7 @@ index bdb273f5134b8..2750336aca016 100644 protected: // Enumerates where the devtools are docked relative to the browser's main // web contents. -@@ -864,6 +873,8 @@ class BrowserView : public BrowserWindow, +@@ -863,6 +872,8 @@ class BrowserView : public BrowserWindow, const gfx::Rect& contents_webview_bounds, const gfx::Rect& local_webview_container_bounds); diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index c4d074347..e39674a8c 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 6223e072246c2..16e112ca96554 100644 +index 90cd61d803a58..acc73d7b702fa 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -9130,6 +9130,16 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9153,6 +9153,16 @@ void RenderFrameHostImpl::CreateNewWindow( return; } @@ -19,7 +19,7 @@ index 6223e072246c2..16e112ca96554 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. -@@ -11472,6 +11482,7 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -11495,6 +11505,7 @@ void RenderFrameHostImpl::CommitNavigation( auto browser_calc_origin_to_commit = navigation_request->GetOriginToCommitWithDebugInfo(); if (!process_lock.is_error_page() && !is_mhtml_subframe && @@ -27,7 +27,7 @@ index 6223e072246c2..16e112ca96554 100644 !policy->CanAccessOrigin( GetProcess()->GetID(), browser_calc_origin_to_commit.first.value(), ChildProcessSecurityPolicyImpl::AccessType::kCanCommitNewOrigin)) { -@@ -15455,6 +15466,7 @@ void RenderFrameHostImpl::DidCommitNavigation( +@@ -15478,6 +15489,7 @@ void RenderFrameHostImpl::DidCommitNavigation( if (interface_params) { if (broker_receiver_.is_bound()) {