diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index cb96670f9..c23caa118 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/104.0.5112.0' + 'chromium_checkout': 'refs/tags/104.0.5112.12', + 'depot_tools_checkout': '350d210871' } diff --git a/patch/patches/base_sandbox_2743.patch b/patch/patches/base_sandbox_2743.patch index 25835b1cb..1ee9b92b7 100644 --- a/patch/patches/base_sandbox_2743.patch +++ b/patch/patches/base_sandbox_2743.patch @@ -1,5 +1,5 @@ diff --git base/BUILD.gn base/BUILD.gn -index 3d13052ffc51f..808aa7607c890 100644 +index 2b1a93670de43..aab1938cd69ec 100644 --- base/BUILD.gn +++ base/BUILD.gn @@ -37,6 +37,7 @@ import("//build/nocompile.gni") @@ -10,7 +10,7 @@ index 3d13052ffc51f..808aa7607c890 100644 import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/test.gni") -@@ -1903,7 +1904,11 @@ mixed_component("base") { +@@ -1905,7 +1906,11 @@ mixed_component("base") { "hash/md5_constexpr_internal.h", "hash/sha1.h", ] @@ -23,7 +23,7 @@ index 3d13052ffc51f..808aa7607c890 100644 sources += [ "hash/md5_nacl.cc", "hash/md5_nacl.h", -@@ -2056,6 +2061,12 @@ mixed_component("base") { +@@ -2058,6 +2063,12 @@ mixed_component("base") { defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ] } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 71e488c13..b265dce42 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -13,7 +13,7 @@ index 3285e422f76c1..5f35b91897b75 100644 return false; } diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 66bece3638bf5..87e059da1256c 100644 +index 583a685cd125a..bef2272570eb1 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni") @@ -43,7 +43,7 @@ index 66bece3638bf5..87e059da1256c 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -5461,6 +5467,7 @@ static_library("ui") { +@@ -5463,6 +5469,7 @@ static_library("ui") { if (enable_basic_printing) { deps += [ "//components/printing/browser", diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 82bbdb40d..83955613b 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -180,7 +180,7 @@ index 9bd586697dece..80ef1f08cb463 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 9c9b99da5b015..2b76e15ea42da 100644 +index 7a66695df89a2..f8b52636e9936 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -301,11 +301,10 @@ using content::NativeWebKeyboardEvent; @@ -257,7 +257,7 @@ index 9c9b99da5b015..2b76e15ea42da 100644 return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); } -@@ -2993,7 +3011,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { +@@ -3006,7 +3024,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { } void BrowserView::ReparentTopContainerForEndOfImmersive() { @@ -267,7 +267,7 @@ index 9c9b99da5b015..2b76e15ea42da 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -3530,8 +3549,10 @@ void BrowserView::Layout() { +@@ -3543,8 +3562,10 @@ void BrowserView::Layout() { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -280,7 +280,7 @@ index 9c9b99da5b015..2b76e15ea42da 100644 // Some of the situations when the BrowserView is laid out are: // - Enter/exit immersive fullscreen mode. -@@ -3597,6 +3618,11 @@ void BrowserView::AddedToWidget() { +@@ -3610,6 +3631,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -292,7 +292,7 @@ index 9c9b99da5b015..2b76e15ea42da 100644 toolbar_->Init(); // TODO(pbos): Manage this either inside SidePanel or the corresponding button -@@ -3658,13 +3684,9 @@ void BrowserView::AddedToWidget() { +@@ -3671,13 +3697,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -308,7 +308,7 @@ index 9c9b99da5b015..2b76e15ea42da 100644 using_native_frame_ = frame_->ShouldUseNativeFrame(); MaybeInitializeWebUITabStrip(); -@@ -4072,7 +4094,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, +@@ -4085,7 +4107,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, // Undo our anti-jankiness hacks and force a re-layout. in_process_fullscreen_ = false; ToolbarSizeChanged(false); @@ -318,7 +318,7 @@ index 9c9b99da5b015..2b76e15ea42da 100644 } bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { -@@ -4387,6 +4410,8 @@ Profile* BrowserView::GetProfile() { +@@ -4400,6 +4423,8 @@ Profile* BrowserView::GetProfile() { } void BrowserView::UpdateUIForTabFullscreen() { @@ -327,7 +327,7 @@ index 9c9b99da5b015..2b76e15ea42da 100644 frame()->GetFrameView()->UpdateFullscreenTopUI(); } -@@ -4409,6 +4434,8 @@ void BrowserView::HideDownloadShelf() { +@@ -4422,6 +4447,8 @@ void BrowserView::HideDownloadShelf() { } bool BrowserView::CanUserExitFullscreen() const { diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 40e51991e..7bfc6aa2a 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc -index 122c7aac0fe18..f8017f174292d 100644 +index 2df5ce6a4ebb8..d74f93c7a4b38 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc @@ -22,6 +22,7 @@ @@ -10,7 +10,7 @@ index 122c7aac0fe18..f8017f174292d 100644 #include "chrome/browser/browser_features.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" -@@ -745,7 +746,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -752,7 +753,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( // Configure on-disk storage for non-OTR profiles. OTR profiles just use // default behavior (in memory storage, default sizes). @@ -31,7 +31,7 @@ index 122c7aac0fe18..f8017f174292d 100644 PrefService* local_state = g_browser_process->local_state(); // Configure the HTTP cache path and size. base::FilePath base_cache_path; -@@ -758,7 +771,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -765,7 +778,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( base_cache_path.Append(chrome::kCacheDirname); network_context_params->http_cache_max_size = local_state->GetInteger(prefs::kDiskCacheSize);