diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index b253d1223..897389062 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/123.0.6312.4', + 'chromium_checkout': 'refs/tags/123.0.6312.22', 'depot_tools_checkout': 'cb43b5d82d' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 4aca12c8a..eafb784fd 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -1,8 +1,8 @@ diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc -index 7517bd98e4f7c..6a49e25d63436 100644 +index 34a70f8af5d6f..eba2a5b3a620f 100644 --- content/browser/child_process_security_policy_impl.cc +++ content/browser/child_process_security_policy_impl.cc -@@ -1900,6 +1900,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin( +@@ -1905,6 +1905,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin( // DeclarativeApiTest.PersistRules. if (actual_process_lock.matches_scheme(url::kDataScheme)) return true; diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 75f4eb113..2e004e7c0 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -363,7 +363,7 @@ index 2e973c9e279b0..12b62efb8071f 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 874b4502f94e2..8c15da46dad67 100644 +index 114fe04f0cd05..c3c8c1a7970fd 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -347,11 +347,10 @@ using content::NativeWebKeyboardEvent; @@ -381,7 +381,7 @@ index 874b4502f94e2..8c15da46dad67 100644 #if BUILDFLAG(IS_CHROMEOS_ASH) // UMA histograms that record animation smoothness for tab loading animation. -@@ -678,6 +677,14 @@ class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate { +@@ -684,6 +683,14 @@ class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate { return browser_view_->frame()->GetTopInset() - browser_view_->y(); } @@ -396,7 +396,7 @@ index 874b4502f94e2..8c15da46dad67 100644 bool IsToolbarVisible() const override { return browser_view_->IsToolbarVisible(); } -@@ -829,11 +836,21 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver { +@@ -835,11 +842,21 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver { /////////////////////////////////////////////////////////////////////////////// // BrowserView, public: @@ -419,7 +419,7 @@ index 874b4502f94e2..8c15da46dad67 100644 // Store the actions so that the access is available for other classes. if (features::IsSidePanelPinningEnabled()) { browser_->SetUserData(BrowserActions::UserDataKey(), -@@ -938,8 +955,15 @@ BrowserView::BrowserView(std::unique_ptr browser) +@@ -944,8 +961,15 @@ BrowserView::BrowserView(std::unique_ptr browser) contents_container->SetLayoutManager(std::make_unique( devtools_web_view_, contents_web_view_, watermark_view)); @@ -437,7 +437,7 @@ index 874b4502f94e2..8c15da46dad67 100644 contents_separator_ = top_container_->AddChildView(std::make_unique()); -@@ -1013,7 +1037,9 @@ BrowserView::~BrowserView() { +@@ -1019,7 +1043,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. @@ -447,7 +447,7 @@ index 874b4502f94e2..8c15da46dad67 100644 // Stop the animation timer explicitly here to avoid running it in a nested // message loop, which may run by Browser destructor. -@@ -1027,12 +1053,14 @@ BrowserView::~BrowserView() { +@@ -1033,12 +1059,14 @@ BrowserView::~BrowserView() { // child views and it is an observer for avatar toolbar button if any. autofill_bubble_handler_.reset(); @@ -462,7 +462,7 @@ index 874b4502f94e2..8c15da46dad67 100644 // The TabStrip attaches a listener to the model. Make sure we shut down the // TabStrip first so that it can cleanly remove the listener. -@@ -1050,7 +1078,9 @@ BrowserView::~BrowserView() { +@@ -1056,7 +1084,9 @@ BrowserView::~BrowserView() { // `SidePanelUI::RemoveSidePanelUIForBrowser()` deletes the // SidePanelCoordinator. @@ -472,7 +472,7 @@ index 874b4502f94e2..8c15da46dad67 100644 } // static -@@ -2003,9 +2033,14 @@ void BrowserView::OnExclusiveAccessUserInput() { +@@ -2009,9 +2039,14 @@ void BrowserView::OnExclusiveAccessUserInput() { bool BrowserView::ShouldHideUIForFullscreen() const { // Immersive mode needs UI for the slide-down top panel. @@ -488,7 +488,7 @@ index 874b4502f94e2..8c15da46dad67 100644 return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); } -@@ -3123,7 +3158,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() { +@@ -3129,7 +3164,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() { } DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() { @@ -498,7 +498,7 @@ index 874b4502f94e2..8c15da46dad67 100644 if (auto* download_button = toolbar_button_provider_->GetDownloadButton()) return download_button->bubble_controller(); return nullptr; -@@ -3678,7 +3714,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { +@@ -3684,7 +3720,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { if (top_container()->parent() == this) return; @@ -508,7 +508,7 @@ index 874b4502f94e2..8c15da46dad67 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -4159,11 +4196,38 @@ void BrowserView::GetAccessiblePanes(std::vector* panes) { +@@ -4166,11 +4203,38 @@ void BrowserView::GetAccessiblePanes(std::vector* panes) { bool BrowserView::ShouldDescendIntoChildForEventHandling( gfx::NativeView child, const gfx::Point& location) { @@ -549,7 +549,7 @@ index 874b4502f94e2..8c15da46dad67 100644 // Draggable regions are defined relative to the web contents. gfx::Point point_in_contents_web_view_coords(location); views::View::ConvertPointToTarget(GetWidget()->GetRootView(), -@@ -4172,7 +4236,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling( +@@ -4179,7 +4243,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. @@ -558,7 +558,7 @@ index 874b4502f94e2..8c15da46dad67 100644 point_in_contents_web_view_coords.x(), point_in_contents_web_view_coords.y()) || WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords); -@@ -4283,8 +4347,10 @@ void BrowserView::Layout(PassKey) { +@@ -4290,8 +4354,10 @@ void BrowserView::Layout(PassKey) { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -571,7 +571,7 @@ index 874b4502f94e2..8c15da46dad67 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -4350,6 +4416,11 @@ void BrowserView::AddedToWidget() { +@@ -4357,6 +4423,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -583,7 +583,7 @@ index 874b4502f94e2..8c15da46dad67 100644 toolbar_->Init(); // TODO(pbos): Investigate whether the side panels should be creatable when -@@ -4398,13 +4469,9 @@ void BrowserView::AddedToWidget() { +@@ -4405,13 +4476,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -599,7 +599,7 @@ index 874b4502f94e2..8c15da46dad67 100644 using_native_frame_ = frame_->ShouldUseNativeFrame(); MaybeInitializeWebUITabStrip(); -@@ -4830,7 +4897,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, +@@ -4837,7 +4904,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, // Undo our anti-jankiness hacks and force a re-layout. in_process_fullscreen_ = false; ToolbarSizeChanged(false); @@ -609,7 +609,7 @@ index 874b4502f94e2..8c15da46dad67 100644 } bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { -@@ -5241,6 +5309,8 @@ Profile* BrowserView::GetProfile() { +@@ -5248,6 +5316,8 @@ Profile* BrowserView::GetProfile() { } void BrowserView::UpdateUIForTabFullscreen() { @@ -618,7 +618,7 @@ index 874b4502f94e2..8c15da46dad67 100644 frame()->GetFrameView()->UpdateFullscreenTopUI(); } -@@ -5263,6 +5333,8 @@ void BrowserView::HideDownloadShelf() { +@@ -5270,6 +5340,8 @@ void BrowserView::HideDownloadShelf() { } bool BrowserView::CanUserExitFullscreen() const { diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index fe9f56f26..8b66f37a9 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -39,10 +39,10 @@ index 6e7e22ee886fa..97d0184ceae99 100644 factory = std::move(factory_builder).Finish(std::move(loader_factory)); } else { diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index 737dcbdee639d..1344e564a9d1f 100644 +index 6533ed7f83572..2b7e8791fc7ab 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc -@@ -1071,7 +1071,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( +@@ -1075,7 +1075,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( void ContentBrowserClient::OnNetworkServiceCreated( network::mojom::NetworkService* network_service) {} @@ -51,7 +51,7 @@ index 737dcbdee639d..1344e564a9d1f 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1080,6 +1080,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( +@@ -1084,6 +1084,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( cert_verifier_creation_params) { network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = "en-us,en"; @@ -60,7 +60,7 @@ index 737dcbdee639d..1344e564a9d1f 100644 std::vector diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 26999a1fa55c7..1c5fbd03212f1 100644 +index dd7ec4f73bd37..b059c32564b31 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -43,6 +43,7 @@ @@ -71,7 +71,7 @@ index 26999a1fa55c7..1c5fbd03212f1 100644 #include "content/public/common/alternative_error_page_override_info.mojom-forward.h" #include "content/public/common/page_visibility_state.h" #include "content/public/common/window_container_type.mojom-forward.h" -@@ -2018,7 +2019,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2024,7 +2025,7 @@ class CONTENT_EXPORT ContentBrowserClient { // // If |relative_partition_path| is the empty string, it means this needs to // create the default NetworkContext for the BrowserContext. @@ -80,7 +80,7 @@ index 26999a1fa55c7..1c5fbd03212f1 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -2238,6 +2239,19 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2244,6 +2245,19 @@ class CONTENT_EXPORT ContentBrowserClient { RenderFrameHost* initiator_document, mojo::PendingRemote* out_factory); @@ -100,7 +100,7 @@ index 26999a1fa55c7..1c5fbd03212f1 100644 // Creates an OverlayWindow to be used for video or Picture-in-Picture. // This window will house the content shown when in Picture-in-Picture mode. // This will return a new OverlayWindow. -@@ -2295,6 +2309,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2301,6 +2315,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct(); diff --git a/patch/patches/content_renderer_host_3617.patch b/patch/patches/content_renderer_host_3617.patch index cd88067f5..cbbf62e13 100644 --- a/patch/patches/content_renderer_host_3617.patch +++ b/patch/patches/content_renderer_host_3617.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index fd63bad192e9b..262a286478b67 100644 +index beb0522f59f96..baed58b1fddd3 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -1623,7 +1623,8 @@ bool RenderProcessHostImpl::Init() { diff --git a/patch/patches/osr_fling_2745.patch b/patch/patches/osr_fling_2745.patch index 48e06fcbc..cc60d7e27 100644 --- a/patch/patches/osr_fling_2745.patch +++ b/patch/patches/osr_fling_2745.patch @@ -13,10 +13,10 @@ index 431df5d50debe..0fcc9ea8fbb1a 100644 return nullptr; } diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc -index d07266a32e786..5a0baf4aa9c6d 100644 +index 5e4c61925a7ff..4bfdebe9cd5c7 100644 --- content/browser/renderer_host/render_widget_host_impl.cc +++ content/browser/renderer_host/render_widget_host_impl.cc -@@ -3313,6 +3313,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { +@@ -3317,6 +3317,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE); } @@ -29,7 +29,7 @@ index d07266a32e786..5a0baf4aa9c6d 100644 const WebInputEvent& event) { if ((base::FeatureList::IsEnabled( diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h -index 8e48429dbce98..daf8386513031 100644 +index 7d8224bbb4141..af0fdad6399a3 100644 --- content/browser/renderer_host/render_widget_host_impl.h +++ content/browser/renderer_host/render_widget_host_impl.h @@ -811,6 +811,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index d405e6ce2..8821a8872 100644 --- a/patch/patches/rfh_navigation_4829483.patch +++ b/patch/patches/rfh_navigation_4829483.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index 04988fb23c26a..8d41d7b90f420 100644 +index 5181caded5641..034c54372fd59 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc @@ -10351,6 +10351,7 @@ void RenderFrameHostImpl::CommitNavigation( diff --git a/patch/patches/views_1749_2102_3330.patch b/patch/patches/views_1749_2102_3330.patch index f045a0fe3..27dc79813 100644 --- a/patch/patches/views_1749_2102_3330.patch +++ b/patch/patches/views_1749_2102_3330.patch @@ -134,7 +134,7 @@ index cbc1a0e7833fe..da451800b1a56 100644 friend class test::InkDropHostTestApi; diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc -index 30555a9c9c2a6..399eabb548184 100644 +index 1769fd6c47586..a30229e71e818 100644 --- ui/views/controls/button/label_button.cc +++ ui/views/controls/button/label_button.cc @@ -578,6 +578,12 @@ void LabelButton::OnThemeChanged() { @@ -791,7 +791,7 @@ index 9228af7f0b02e..a6957017fef5c 100644 #if !BUILDFLAG(IS_CHROMEOS_LACROS) if (root_location != root_current_location && diff --git ui/views/view.h ui/views/view.h -index 90905a70c39f1..59e1959efe352 100644 +index 04ece3c06453f..7d03bcf7e6a5e 100644 --- ui/views/view.h +++ ui/views/view.h @@ -25,6 +25,7 @@ diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index daae86744..97d9fa506 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -529,7 +529,7 @@ index cbe655d5879d6..a72c3450d1fa7 100644 break; case ui::SHOW_STATE_END: diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc -index 257e4c1059db7..9a080524825c7 100644 +index 02a88fb4174c7..3b4ae49f9ca93 100644 --- ui/views/widget/widget.cc +++ ui/views/widget/widget.cc @@ -399,7 +399,8 @@ void Widget::Init(InitParams params) { @@ -571,7 +571,7 @@ index 257e4c1059db7..9a080524825c7 100644 } } -@@ -1655,10 +1666,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) { +@@ -1659,10 +1670,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) { } gfx::Size Widget::GetMinimumSize() const { @@ -588,7 +588,7 @@ index 257e4c1059db7..9a080524825c7 100644 return non_client_view_ ? non_client_view_->GetMaximumSize() : gfx::Size(); } -@@ -1909,7 +1926,8 @@ bool Widget::SetInitialFocus(ui::WindowShowState show_state) { +@@ -1913,7 +1930,8 @@ bool Widget::SetInitialFocus(ui::WindowShowState show_state) { return false; View* v = widget_delegate_->GetInitiallyFocusedView(); if (!focus_on_creation_ || show_state == ui::SHOW_STATE_INACTIVE || @@ -599,7 +599,7 @@ index 257e4c1059db7..9a080524825c7 100644 // focus when the window is restored. if (v) diff --git ui/views/widget/widget.h ui/views/widget/widget.h -index 5d190896a1308..36322410b8373 100644 +index d47c52cc154ce..97bd67e923168 100644 --- ui/views/widget/widget.h +++ ui/views/widget/widget.h @@ -356,6 +356,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,