diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 04ee508cd..aa9d729ee 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/100.0.4896.46', + 'chromium_checkout': 'refs/tags/100.0.4896.60', 'depot_tools_checkout': '32645dfee9' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index b5cacd4e8..3000af6fd 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index ec3262207e626..910e0b6a9ff89 100644 // TODO(wjmaclean): We should update the ProcessLock comparison API diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc -index 5a7fa871f7b26..71fa1b1bcd8fd 100644 +index 933385d532923..569ff1739cf5d 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -5940,6 +5940,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( +@@ -5942,6 +5942,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( network::mojom::WebSandboxFlags sandbox_flags) { // Calculate an approximation of the origin. The sandbox/csp are ignored. url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this); @@ -36,7 +36,7 @@ index 5a7fa871f7b26..71fa1b1bcd8fd 100644 // Apply sandbox flags. // See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag -@@ -5973,6 +5979,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { +@@ -5975,6 +5981,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { if (IsSameDocument() || IsPageActivation()) return GetRenderFrameHost()->GetLastCommittedOrigin(); diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index ff07e0c6f..bd00621b9 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 560930c0979ca..e99dcad7a2e5d 100644 +index 9917fcf771ecb..5818da367fdcb 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 52e4be4b1..bcf342f62 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 1301f3baf5b7f..bebc86d812313 100644 +index 3063256f8922f..3e16e4d46afe2 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -292,6 +292,13 @@ base::OnceCallback* GetMenuShownCallback() { diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 5b87928ca..666bdb8b6 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -85,10 +85,10 @@ index ca2561e412621..febd52df6c971 100644 virtual bool IsSignedIn() = 0; diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc -index bd0c693804407..c4a62b0dae176 100644 +index 7a216c9ffb4d7..0de2540755722 100644 --- chrome/browser/profiles/profile_impl.cc +++ chrome/browser/profiles/profile_impl.cc -@@ -1002,7 +1002,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, +@@ -996,7 +996,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 056a54694..987b752cf 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -132,7 +132,7 @@ index 3d59014db49e9..f96b79c02fd92 100644 GetMainRunLoopInstance()->QuitWhenIdleClosure()); } diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm -index 831d7173873d1..594aee58331a7 100644 +index 8bf722c61c059..ac755279227f2 100644 --- chrome/browser/chrome_browser_main_mac.mm +++ chrome/browser/chrome_browser_main_mac.mm @@ -16,6 +16,7 @@ @@ -143,7 +143,7 @@ index 831d7173873d1..594aee58331a7 100644 #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/apps/app_shim/app_shim_listener.h" #include "chrome/browser/browser_process.h" -@@ -111,6 +112,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { +@@ -112,6 +113,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { } } @@ -151,15 +151,15 @@ index 831d7173873d1..594aee58331a7 100644 // Create the app delegate. This object is intentionally leaked as a global // singleton. It is accessed through -[NSApp delegate]. AppController* app_controller = [[AppController alloc] init]; -@@ -119,6 +121,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { +@@ -120,6 +122,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { chrome::BuildMainMenu(NSApp, app_controller, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false); [app_controller mainMenuCreated]; +#endif // BUILDFLAG(ENABLE_CEF) chrome::DeveloperIDCertificateReauthorizeInApp(); - -@@ -180,7 +183,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile, + chrome::PurgeStaleScreenCapturePermission(); +@@ -182,7 +185,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile, } void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 5e198091e..c8ebf4471 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -139,7 +139,7 @@ index 67496d7ab6c50..fa97b9abe6253 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 1da4bd396d452..3a7f82497d487 100644 +index d144cbf0fdbe8..7210aafab4bea 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -297,11 +297,10 @@ using content::WebContents; @@ -207,7 +207,7 @@ index 1da4bd396d452..3a7f82497d487 100644 contents_separator_ = top_container_->AddChildView(std::make_unique()); -@@ -1646,6 +1662,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { +@@ -1643,6 +1659,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { if (immersive_mode_controller_->IsEnabled()) return false; @@ -216,7 +216,7 @@ index 1da4bd396d452..3a7f82497d487 100644 return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); } -@@ -2816,7 +2834,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { +@@ -2813,7 +2831,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { } void BrowserView::ReparentTopContainerForEndOfImmersive() { @@ -226,7 +226,7 @@ index 1da4bd396d452..3a7f82497d487 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -3305,8 +3324,10 @@ void BrowserView::Layout() { +@@ -3302,8 +3321,10 @@ void BrowserView::Layout() { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -239,7 +239,7 @@ index 1da4bd396d452..3a7f82497d487 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -3372,6 +3393,11 @@ void BrowserView::AddedToWidget() { +@@ -3369,6 +3390,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -251,7 +251,7 @@ index 1da4bd396d452..3a7f82497d487 100644 toolbar_->Init(); // TODO(pbos): Manage this either inside SidePanel or the corresponding button -@@ -3424,13 +3450,9 @@ void BrowserView::AddedToWidget() { +@@ -3421,13 +3447,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -267,7 +267,7 @@ index 1da4bd396d452..3a7f82497d487 100644 using_native_frame_ = frame_->ShouldUseNativeFrame(); MaybeInitializeWebUITabStrip(); -@@ -3851,7 +3873,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, +@@ -3848,7 +3870,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, // Undo our anti-jankiness hacks and force a re-layout. in_process_fullscreen_ = false; ToolbarSizeChanged(false); @@ -277,7 +277,7 @@ index 1da4bd396d452..3a7f82497d487 100644 } bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { -@@ -4178,6 +4201,8 @@ Profile* BrowserView::GetProfile() { +@@ -4175,6 +4198,8 @@ Profile* BrowserView::GetProfile() { } void BrowserView::UpdateUIForTabFullscreen() { @@ -286,7 +286,7 @@ index 1da4bd396d452..3a7f82497d487 100644 frame()->GetFrameView()->UpdateFullscreenTopUI(); } -@@ -4200,6 +4225,8 @@ void BrowserView::HideDownloadShelf() { +@@ -4197,6 +4222,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 69aab8868..e34baaac1 100644 --- a/patch/patches/net_cookie_flags.patch +++ b/patch/patches/net_cookie_flags.patch @@ -10,10 +10,10 @@ index 96d1a51ec1078..e8120a818b1f2 100644 +// This load will not send any cookies. For CEF usage. +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17) diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc -index 3faca2e98f4ac..c6729030a53cc 100644 +index ed3542a0fedb9..7490cf6723f65 100644 --- net/url_request/url_request_http_job.cc +++ net/url_request/url_request_http_job.cc -@@ -1750,7 +1750,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const { +@@ -1774,7 +1774,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/services_network_2622.patch b/patch/patches/services_network_2622.patch index 3c175fdd1..8259a3128 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -42,7 +42,7 @@ index 86cb596c6a4f2..e4f45f5b1c2fa 100644 ::network::mojom::NetworkContextFilePaths::New(); diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc -index 2885d39d1f6e5..bd373d28498c7 100644 +index 3638d994a72a1..7840dc304b0c6 100644 --- net/cookies/cookie_monster.cc +++ net/cookies/cookie_monster.cc @@ -547,6 +547,25 @@ void CookieMonster::SetCookieableSchemes( @@ -72,7 +72,7 @@ index 2885d39d1f6e5..bd373d28498c7 100644 void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) { DCHECK(thread_checker_.CalledOnValidThread()); diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h -index 5ba0bcac86588..8efbece455f2b 100644 +index 429ec9d9df500..ca58ec477d249 100644 --- net/cookies/cookie_monster.h +++ net/cookies/cookie_monster.h @@ -207,6 +207,8 @@ class NET_EXPORT CookieMonster : public CookieStore { @@ -85,7 +85,7 @@ index 5ba0bcac86588..8efbece455f2b 100644 // Enables writing session cookies into the cookie database. If this this // method is called, it must be called before first use of the instance diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h -index 4dbe5fd1b2c11..ef797ae9b858c 100644 +index 0cd83a8038362..acc52d3b67c66 100644 --- net/cookies/cookie_store.h +++ net/cookies/cookie_store.h @@ -161,6 +161,11 @@ class NET_EXPORT CookieStore { @@ -101,7 +101,7 @@ index 4dbe5fd1b2c11..ef797ae9b858c 100644 // reset to null. const CookieAccessDelegate* cookie_access_delegate() const { diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc -index f5df9b6c27e9f..ea02e2b379f3a 100644 +index 49c53dc75789f..07c204a826877 100644 --- services/network/cookie_manager.cc +++ services/network/cookie_manager.cc @@ -366,14 +366,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {