diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 0365e36e4..d2efd3628 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/122.0.6261.6', + 'chromium_checkout': 'refs/tags/122.0.6261.18', 'depot_tools_checkout': '10bd39fd47' } diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index e2f4b0f08..4cf2d9c8e 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 5ebec17f77393..f94c18f8de78e 100644 +index 37b1cdbab20c4..5f4eae9a103cb 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -360,6 +360,13 @@ base::OnceCallback* GetMenuShownCallback() { @@ -55,7 +55,7 @@ index 5ebec17f77393..f94c18f8de78e 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -3515,6 +3540,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -3526,6 +3551,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 06ae1a4c6..c6f350629 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -14,7 +14,7 @@ index 9bba6cea235e0..9dc5b40559207 100644 } diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc -index 28b166f4f499c..5892638bb43c8 100644 +index de0a5e38ca13f..ec2f4d194afd1 100644 --- chrome/browser/profiles/profile.cc +++ chrome/browser/profiles/profile.cc @@ -87,6 +87,7 @@ base::LazyInstance>::Leaky diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 290757895..dbaaeccad 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 e2827eb98518f..3e33205a91f1b 100644 +index a3090da2ca8b4..463a07929734e 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -346,11 +346,10 @@ using content::NativeWebKeyboardEvent; @@ -488,7 +488,7 @@ index e2827eb98518f..3e33205a91f1b 100644 return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); } -@@ -3083,7 +3118,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() { +@@ -3086,7 +3121,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() { } DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() { @@ -498,7 +498,7 @@ index e2827eb98518f..3e33205a91f1b 100644 if (auto* download_button = toolbar_button_provider_->GetDownloadButton()) return download_button->bubble_controller(); return nullptr; -@@ -3642,7 +3678,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { +@@ -3645,7 +3681,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { if (top_container()->parent() == this) return; @@ -508,7 +508,7 @@ index e2827eb98518f..3e33205a91f1b 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -4123,11 +4160,38 @@ void BrowserView::GetAccessiblePanes(std::vector* panes) { +@@ -4126,11 +4163,38 @@ void BrowserView::GetAccessiblePanes(std::vector* panes) { bool BrowserView::ShouldDescendIntoChildForEventHandling( gfx::NativeView child, const gfx::Point& location) { @@ -549,7 +549,7 @@ index e2827eb98518f..3e33205a91f1b 100644 // Draggable regions are defined relative to the web contents. gfx::Point point_in_contents_web_view_coords(location); views::View::ConvertPointToTarget(GetWidget()->GetRootView(), -@@ -4136,7 +4200,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling( +@@ -4139,7 +4203,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 e2827eb98518f..3e33205a91f1b 100644 point_in_contents_web_view_coords.x(), point_in_contents_web_view_coords.y()) || WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords); -@@ -4247,8 +4311,10 @@ void BrowserView::Layout() { +@@ -4250,8 +4314,10 @@ void BrowserView::Layout() { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -571,7 +571,7 @@ index e2827eb98518f..3e33205a91f1b 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -4314,6 +4380,11 @@ void BrowserView::AddedToWidget() { +@@ -4317,6 +4383,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -583,7 +583,7 @@ index e2827eb98518f..3e33205a91f1b 100644 toolbar_->Init(); // TODO(pbos): Investigate whether the side panels should be creatable when -@@ -4362,13 +4433,9 @@ void BrowserView::AddedToWidget() { +@@ -4365,13 +4436,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -599,7 +599,7 @@ index e2827eb98518f..3e33205a91f1b 100644 using_native_frame_ = frame_->ShouldUseNativeFrame(); MaybeInitializeWebUITabStrip(); -@@ -4793,7 +4860,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, +@@ -4796,7 +4863,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 e2827eb98518f..3e33205a91f1b 100644 } bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { -@@ -5191,6 +5259,8 @@ Profile* BrowserView::GetProfile() { +@@ -5194,6 +5262,8 @@ Profile* BrowserView::GetProfile() { } void BrowserView::UpdateUIForTabFullscreen() { @@ -618,7 +618,7 @@ index e2827eb98518f..3e33205a91f1b 100644 frame()->GetFrameView()->UpdateFullscreenTopUI(); } -@@ -5213,6 +5283,8 @@ void BrowserView::HideDownloadShelf() { +@@ -5216,6 +5286,8 @@ void BrowserView::HideDownloadShelf() { } bool BrowserView::CanUserExitFullscreen() const { diff --git a/patch/patches/net_cookie_flags.patch b/patch/patches/net_cookie_flags.patch index 8abfe3fe4..d95add428 100644 --- a/patch/patches/net_cookie_flags.patch +++ b/patch/patches/net_cookie_flags.patch @@ -10,10 +10,10 @@ index 0e563dbb253ca..891b2bbc3785c 100644 +// This load will not send any cookies. For CEF usage. +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 20) diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc -index 6eeea59318bbc..6e46770ca0f74 100644 +index 3afc5526490ed..096d171e93edc 100644 --- net/url_request/url_request_http_job.cc +++ net/url_request/url_request_http_job.cc -@@ -1850,7 +1850,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const { +@@ -1890,7 +1890,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const { // Read cookies whenever allow_credentials() is true, even if the PrivacyMode // is being overridden by NetworkDelegate and will eventually block them, as // blocked cookies still need to be logged in that case. diff --git a/patch/patches/set_resize_background_color.patch b/patch/patches/set_resize_background_color.patch index 3a4ca5ba2..1cd5d591c 100644 --- a/patch/patches/set_resize_background_color.patch +++ b/patch/patches/set_resize_background_color.patch @@ -1,5 +1,5 @@ diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc -index 8df4e98500b1e..f649d016e1e5a 100644 +index 25ee101d5e164..edd2bc8ae9a4f 100644 --- ui/views/controls/webview/webview.cc +++ ui/views/controls/webview/webview.cc @@ -159,6 +159,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size, @@ -14,7 +14,7 @@ index 8df4e98500b1e..f649d016e1e5a 100644 if (crashed_overlay_view_.view() == crashed_overlay_view) { return; diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h -index 3b829d69e4254..6d58b64600c58 100644 +index 23ddefe2a75b7..5a7eea658ed28 100644 --- ui/views/controls/webview/webview.h +++ ui/views/controls/webview/webview.h @@ -93,6 +93,10 @@ class WEBVIEW_EXPORT WebView : public View,