diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 816f1daa2..1f62e3a45 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/91.0.4472.19', + 'chromium_checkout': 'refs/tags/91.0.4472.77', 'depot_tools_checkout': '61bf6e8d69' } diff --git a/patch/patches/base_sandbox_2743.patch b/patch/patches/base_sandbox_2743.patch index 3aee1b816..2522f16ba 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 f9e098611a17..f956745c27fb 100644 +index 7d3506c3587c..7f86e15e508d 100644 --- base/BUILD.gn +++ base/BUILD.gn @@ -34,6 +34,7 @@ import("//build/config/ui.gni") @@ -10,7 +10,7 @@ index f9e098611a17..f956745c27fb 100644 import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/test.gni") import("//third_party/icu/config.gni") -@@ -1742,7 +1743,11 @@ component("base") { +@@ -1746,7 +1747,11 @@ component("base") { "hash/md5_constexpr_internal.h", "hash/sha1.h", ] @@ -23,7 +23,7 @@ index f9e098611a17..f956745c27fb 100644 sources += [ "hash/md5_nacl.cc", "hash/md5_nacl.h", -@@ -1951,6 +1956,12 @@ component("base") { +@@ -1955,6 +1960,12 @@ component("base") { defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ] } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 6b745fd21..8d7ec1d1b 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index 51b159f1ab77..df64ef6cfa7e 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 86ddb8ebaf45..126b2acc924d 100644 +index 6f1fe2a9f91d..d711e0f2a5b4 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -5304,6 +5304,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactory() { +@@ -5320,6 +5320,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactory() { // Calculate an approximation of the origin. The sandbox/csp are ignored. url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this); diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index ed1da80ef..4465022c3 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 2ae4ebab650f..f463b332115e 100644 +index 9fedd8330743..c8323ddcbc7f 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -13,6 +13,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/chrome_browser_background_mode_1100085.patch b/patch/patches/chrome_browser_background_mode_1100085.patch index fb287f37d..1133c521f 100644 --- a/patch/patches/chrome_browser_background_mode_1100085.patch +++ b/patch/patches/chrome_browser_background_mode_1100085.patch @@ -128,24 +128,6 @@ index e0cafee5eedd..06ded156be3c 100644 // Make a copy of the BrowserList to simplify the case where we need to // destroy a Browser during the loop. -diff --git chrome/browser/sessions/app_session_service.cc chrome/browser/sessions/app_session_service.cc -index cb12e5b6e8d9..ae24f7ad5f5d 100644 ---- chrome/browser/sessions/app_session_service.cc -+++ chrome/browser/sessions/app_session_service.cc -@@ -165,8 +165,11 @@ void AppSessionService::MaybeDeleteSessionOnlyData() { - // Clear session data if the last window for a profile has been closed and - // closing the last window would normally close Chrome, unless background mode - // is active. Tests don't have a background_mode_manager. -- if (browser_defaults::kBrowserAliveWithNoWindows || -- g_browser_process->background_mode_manager()->IsBackgroundModeActive()) { -+ if (browser_defaults::kBrowserAliveWithNoWindows -+#if BUILDFLAG(ENABLE_BACKGROUND_MODE) -+ || g_browser_process->background_mode_manager()->IsBackgroundModeActive() -+#endif -+ ) { - return; - } - diff --git chrome/browser/sessions/session_service.cc chrome/browser/sessions/session_service.cc index 24a6b1a3634d..abcb36d783de 100644 --- chrome/browser/sessions/session_service.cc diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 72e7d29bb..4329d974c 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -78,7 +78,7 @@ index 94e871ea16b0..69929718b270 100644 #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc -index 86b9a324e5da..b4e1bfebe116 100644 +index 576a12102934..ed2719558569 100644 --- chrome/browser/chrome_browser_main.cc +++ chrome/browser/chrome_browser_main.cc @@ -49,6 +49,7 @@ @@ -89,7 +89,7 @@ index 86b9a324e5da..b4e1bfebe116 100644 #include "chrome/browser/about_flags.h" #include "chrome/browser/active_use_util.h" #include "chrome/browser/after_startup_task_utils.h" -@@ -896,8 +897,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -914,8 +915,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { #if !defined(OS_ANDROID) // Create the RunLoop for MainMessageLoopRun() to use, and pass a copy of // its QuitClosure to the BrowserProcessImpl to call when it is time to exit. @@ -101,7 +101,7 @@ index 86b9a324e5da..b4e1bfebe116 100644 // These members must be initialized before returning from this function. // Android doesn't use StartupBrowserCreator. -@@ -1639,11 +1642,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1657,11 +1660,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // This step is costly and is already measured in // Startup.StartupBrowserCreator_Start. // See the comment above for an explanation of |process_command_line|. @@ -156,7 +156,7 @@ index 8a33ce57766c..ca69a37eee22 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 02b5855f9f95..1d25f15ec778 100644 +index 038944fa1d04..22b79e9259ee 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -37,6 +37,7 @@ @@ -167,7 +167,7 @@ index 02b5855f9f95..1d25f15ec778 100644 #include "chrome/browser/accessibility/accessibility_labels_service.h" #include "chrome/browser/accessibility/accessibility_labels_service_factory.h" #include "chrome/browser/accessibility/caption_util.h" -@@ -3653,9 +3654,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -3667,9 +3668,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // defined(OS_ANDROID) @@ -205,7 +205,7 @@ index d126ddd3a24d..5e8c5ae7c093 100644 base::mac::ScopedMachSendRight exceptionPort( crash_reporter::GetCrashpadClient().GetHandlerMachPort()); diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc -index 7f814486ab67..512dbd488d75 100644 +index 2d7245565413..0932480573e4 100644 --- chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc @@ -10,6 +10,7 @@ @@ -227,7 +227,7 @@ index 7f814486ab67..512dbd488d75 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h" -@@ -974,6 +979,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -976,6 +981,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, RegisterSessionServiceLogProfilePrefs(registry); #endif diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 7364494de..230affe02 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -278,10 +278,10 @@ index 56ef53cf379d..f0f1057896bd 100644 bool toolbar_visible = delegate_->IsToolbarVisible(); int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0; diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc -index 9220245ea195..90dd93503b57 100644 +index 8f35534df18f..c29ebc024aa2 100644 --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc -@@ -571,37 +571,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup( +@@ -580,37 +580,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup( } bool BrowserTabStripController::IsFrameCondensed() const { diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index fa5523c80..6bb8b62c7 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -234,7 +234,7 @@ index a544bfed7ed8..60aad01350c2 100644 string mime_type) => (bool found, diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index 0fadf2a320b0..8c491e3b4806 100644 +index 97c47faadb92..7b732f17360b 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc @@ -9,7 +9,7 @@ @@ -247,7 +247,7 @@ index 0fadf2a320b0..8c491e3b4806 100644 #include diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index b031e69e4fe0..8c91423f8c14 100644 +index aac67f9733e5..aadc1036e6af 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -32,6 +32,7 @@ @@ -258,7 +258,7 @@ index b031e69e4fe0..8c91423f8c14 100644 #include "content/public/common/page_visibility_state.h" #include "content/public/common/window_container_type.mojom-forward.h" #include "device/vr/buildflags/buildflags.h" -@@ -1747,6 +1748,14 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1763,6 +1764,14 @@ class CONTENT_EXPORT ContentBrowserClient { const base::Optional& initiating_origin, mojo::PendingRemote* out_factory); @@ -273,7 +273,7 @@ index b031e69e4fe0..8c91423f8c14 100644 // Creates an OverlayWindow to be used for Picture-in-Picture. This window // will house the content shown when in Picture-in-Picture mode. This will // return a new OverlayWindow. -@@ -1820,6 +1829,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1836,6 +1845,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct(); diff --git a/patch/patches/print_preview_123.patch b/patch/patches/print_preview_123.patch index 9e4b51bce..fe9199722 100644 --- a/patch/patches/print_preview_123.patch +++ b/patch/patches/print_preview_123.patch @@ -111,7 +111,7 @@ index a96e5a33643e..def5bced1c96 100644 void Observe(int type, const content::NotificationSource& source, diff --git chrome/browser/resources/print_preview/ui/destination_dialog.html chrome/browser/resources/print_preview/ui/destination_dialog.html -index df858712d3be..cd146ea0f26b 100644 +index 920f646f0648..76c0b5e5ee04 100644 --- chrome/browser/resources/print_preview/ui/destination_dialog.html +++ chrome/browser/resources/print_preview/ui/destination_dialog.html @@ -25,10 +25,7 @@ @@ -126,21 +126,6 @@ index df858712d3be..cd146ea0f26b 100644 $i18n{cancel} -diff --git chrome/browser/resources/print_preview/ui/destination_select.html chrome/browser/resources/print_preview/ui/destination_select.html -index 6d3d49c902e7..4769176b9550 100644 ---- chrome/browser/resources/print_preview/ui/destination_select.html -+++ chrome/browser/resources/print_preview/ui/destination_select.html -@@ -20,10 +20,6 @@ - -- -