diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 67c9f6cd7..ed1062a3e 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/110.0.5481.0' + 'chromium_checkout': 'refs/tags/110.0.5481.23', + 'depot_tools_checkout': '252b19866a' } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 849d23386..3c08c7fd6 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -52,7 +52,7 @@ index 932388c328889..68103c2a8ffcf 100644 ] } diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc -index a839ea0969600..b92b5a30ec2e1 100644 +index 5f4092a34b160..344c890310f5d 100644 --- chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc @@ -265,6 +265,25 @@ @@ -81,7 +81,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/extensions/extension_browser_window_helper.h" #endif -@@ -508,6 +527,13 @@ Browser::Browser(const CreateParams& params) +@@ -511,6 +530,13 @@ Browser::Browser(const CreateParams& params) tab_strip_model_->AddObserver(this); @@ -95,7 +95,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 location_bar_model_ = std::make_unique( location_bar_model_delegate_.get(), content::kMaxURLDisplayChars); -@@ -645,6 +671,12 @@ Browser::~Browser() { +@@ -648,6 +674,12 @@ Browser::~Browser() { // away so they don't try and call back to us. if (select_file_dialog_.get()) select_file_dialog_->ListenerDestroyed(); @@ -108,7 +108,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 } /////////////////////////////////////////////////////////////////////////////// -@@ -1337,6 +1369,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( +@@ -1340,6 +1372,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( if (exclusive_access_manager_->HandleUserKeyEvent(event)) return content::KeyboardEventProcessingResult::HANDLED; @@ -123,7 +123,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 return window()->PreHandleKeyboardEvent(event); } -@@ -1344,8 +1384,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, +@@ -1347,8 +1387,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, const NativeWebKeyboardEvent& event) { DevToolsWindow* devtools_window = DevToolsWindow::GetInstanceForInspectedWebContents(source); @@ -144,7 +144,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 } bool Browser::TabsNeedBeforeUnloadFired() { -@@ -1554,6 +1604,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source, +@@ -1557,6 +1607,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source, return window->OpenURLFromTab(source, params); } @@ -159,7 +159,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 NavigateParams nav_params(this, params.url, params.transition); nav_params.FillNavigateParamsFromOpenURLParams(params); nav_params.source_contents = source; -@@ -1684,6 +1742,15 @@ void Browser::AddNewContents( +@@ -1694,6 +1752,15 @@ void Browser::AddNewContents( return; } @@ -175,7 +175,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 chrome::AddWebContents(this, source, std::move(new_contents), target_url, disposition, window_features, window_action); } -@@ -1702,6 +1769,8 @@ void Browser::LoadingStateChanged(WebContents* source, +@@ -1712,6 +1779,8 @@ void Browser::LoadingStateChanged(WebContents* source, bool should_show_loading_ui) { ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD); UpdateWindowForLoadingStateChanged(source, should_show_loading_ui); @@ -184,7 +184,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 } void Browser::CloseContents(WebContents* source) { -@@ -1729,6 +1798,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { +@@ -1739,6 +1808,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { } void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { @@ -193,7 +193,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 if (!GetStatusBubble()) return; -@@ -1736,6 +1807,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { +@@ -1746,6 +1817,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { GetStatusBubble()->SetURL(url); } @@ -211,7 +211,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 void Browser::ContentsMouseEvent(WebContents* source, bool motion, bool exited) { -@@ -1760,6 +1842,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { +@@ -1770,6 +1852,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { return false; } @@ -231,7 +231,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 void Browser::BeforeUnloadFired(WebContents* web_contents, bool proceed, bool* proceed_to_fire_unload) { -@@ -1852,6 +1947,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, +@@ -1862,6 +1957,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, // Make the tab show up in the task manager. task_manager::WebContentsTags::CreateForTabContents(new_contents); @@ -242,7 +242,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 } void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) { -@@ -1896,6 +1995,8 @@ void Browser::RendererResponsive( +@@ -1906,6 +2005,8 @@ void Browser::RendererResponsive( void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) { if (web_contents == tab_strip_model_->GetActiveWebContents()) UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); @@ -251,7 +251,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 } content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( -@@ -1956,11 +2057,15 @@ void Browser::EnterFullscreenModeForTab( +@@ -1966,11 +2067,15 @@ void Browser::EnterFullscreenModeForTab( const blink::mojom::FullscreenOptions& options) { exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( requesting_frame, options.display_id); @@ -267,7 +267,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 } bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { -@@ -2159,6 +2264,15 @@ void Browser::RequestMediaAccessPermission( +@@ -2169,6 +2274,15 @@ void Browser::RequestMediaAccessPermission( content::WebContents* web_contents, const content::MediaStreamRequest& request, content::MediaResponseCallback callback) { @@ -283,7 +283,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 const extensions::Extension* extension = GetExtensionForOrigin(profile_, request.security_origin); MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( -@@ -2695,13 +2809,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { +@@ -2705,13 +2819,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { // Browser, Getters for UI (private): StatusBubble* Browser::GetStatusBubble() { @@ -305,7 +305,7 @@ index a839ea0969600..b92b5a30ec2e1 100644 return window_ ? window_->GetStatusBubble() : nullptr; } -@@ -2831,6 +2952,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { +@@ -2841,6 +2962,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { content_translate_driver->RemoveTranslationObserver(this); BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); } diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 225f38be6..1e145ca5f 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -85,10 +85,10 @@ index d90969cd9478c..9cf454be330ce 100644 virtual bool IsSignedIn() = 0; diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc -index a2a12efa89104..9865a2349490a 100644 +index 0e17f238a710c..7575de124de5b 100644 --- chrome/browser/profiles/profile_impl.cc +++ chrome/browser/profiles/profile_impl.cc -@@ -1012,7 +1012,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, +@@ -1011,7 +1011,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, otr_profiles_[otr_profile_id] = std::move(otr_profile); diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 7d14e586a..883c1543f 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -198,7 +198,7 @@ index 77aaa6d46daea..e428711ec4ab3 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 265904cb255f3..463cb5cad9713 100644 +index 707b972e5ae23..8db3f4b0a0d2c 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -35,6 +35,7 @@ @@ -209,7 +209,7 @@ index 265904cb255f3..463cb5cad9713 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" -@@ -1503,6 +1504,8 @@ void HandleStringData( +@@ -1504,6 +1505,8 @@ void HandleStringData( } // namespace ChromeContentBrowserClient::ChromeContentBrowserClient() { @@ -218,7 +218,7 @@ index 265904cb255f3..463cb5cad9713 100644 #if BUILDFLAG(ENABLE_PLUGINS) extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart); #endif -@@ -1528,6 +1531,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { +@@ -1529,6 +1532,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { extra_parts_.clear(); } @@ -230,7 +230,7 @@ index 265904cb255f3..463cb5cad9713 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -4242,9 +4250,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -4247,9 +4255,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -242,7 +242,7 @@ index 265904cb255f3..463cb5cad9713 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -6110,7 +6120,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -6115,7 +6125,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( network_service); } @@ -251,7 +251,7 @@ index 265904cb255f3..463cb5cad9713 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -6128,6 +6138,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -6133,6 +6143,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -260,7 +260,7 @@ index 265904cb255f3..463cb5cad9713 100644 } std::vector -@@ -6991,10 +7003,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -6996,10 +7008,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -273,7 +273,7 @@ index 265904cb255f3..463cb5cad9713 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -7013,7 +7025,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -7018,7 +7030,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -283,7 +283,7 @@ index 265904cb255f3..463cb5cad9713 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -7149,7 +7162,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -7154,7 +7167,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 5cc1cb7eb..9f329da9d 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -178,7 +178,7 @@ index 28085aa32d7d8..312911b8a4564 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 457e24dccb793..4ccb4705c2d7f 100644 +index 5b3bbc40a9bb8..41744430646ff 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -311,11 +311,10 @@ using content::NativeWebKeyboardEvent; @@ -255,7 +255,7 @@ index 457e24dccb793..4ccb4705c2d7f 100644 return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); } -@@ -2795,7 +2813,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() { +@@ -2796,7 +2814,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() { } DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() { @@ -265,7 +265,7 @@ index 457e24dccb793..4ccb4705c2d7f 100644 if (auto* download_button = toolbar_button_provider_->GetDownloadButton()) return download_button->bubble_controller(); return nullptr; -@@ -3287,7 +3306,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { +@@ -3288,7 +3307,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { if (top_container()->parent() == this) return; @@ -275,7 +275,7 @@ index 457e24dccb793..4ccb4705c2d7f 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -3864,8 +3884,10 @@ void BrowserView::Layout() { +@@ -3865,8 +3885,10 @@ void BrowserView::Layout() { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -288,7 +288,7 @@ index 457e24dccb793..4ccb4705c2d7f 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -3931,6 +3953,11 @@ void BrowserView::AddedToWidget() { +@@ -3932,6 +3954,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -300,7 +300,7 @@ index 457e24dccb793..4ccb4705c2d7f 100644 toolbar_->Init(); // TODO(pbos): Manage this either inside SidePanel or the corresponding button -@@ -3990,13 +4017,9 @@ void BrowserView::AddedToWidget() { +@@ -3991,13 +4018,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -316,7 +316,7 @@ index 457e24dccb793..4ccb4705c2d7f 100644 using_native_frame_ = frame_->ShouldUseNativeFrame(); MaybeInitializeWebUITabStrip(); -@@ -4405,7 +4428,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, +@@ -4406,7 +4429,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, // Undo our anti-jankiness hacks and force a re-layout. in_process_fullscreen_ = false; ToolbarSizeChanged(false); @@ -326,7 +326,7 @@ index 457e24dccb793..4ccb4705c2d7f 100644 } bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { -@@ -4747,6 +4771,8 @@ Profile* BrowserView::GetProfile() { +@@ -4748,6 +4772,8 @@ Profile* BrowserView::GetProfile() { } void BrowserView::UpdateUIForTabFullscreen() { @@ -335,7 +335,7 @@ index 457e24dccb793..4ccb4705c2d7f 100644 frame()->GetFrameView()->UpdateFullscreenTopUI(); } -@@ -4769,6 +4795,8 @@ void BrowserView::HideDownloadShelf() { +@@ -4770,6 +4796,8 @@ void BrowserView::HideDownloadShelf() { } bool BrowserView::CanUserExitFullscreen() const { @@ -345,7 +345,7 @@ index 457e24dccb793..4ccb4705c2d7f 100644 } diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h -index 97f6f59322215..a71571e0d6ce9 100644 +index b37a1c4e7a87b..2dc68dc29f39f 100644 --- chrome/browser/ui/views/frame/browser_view.h +++ chrome/browser/ui/views/frame/browser_view.h @@ -131,11 +131,16 @@ class BrowserView : public BrowserWindow, @@ -365,7 +365,7 @@ index 97f6f59322215..a71571e0d6ce9 100644 void set_frame(BrowserFrame* frame) { frame_ = frame; } BrowserFrame* frame() const { return frame_; } -@@ -803,6 +808,12 @@ class BrowserView : public BrowserWindow, +@@ -804,6 +809,12 @@ class BrowserView : public BrowserWindow, void SetLoadingAnimationStateChangeClosureForTesting( base::OnceClosure closure);