Update to Chromium version 91.0.4472.0 (#870763)

2025-06-05 21:39:12 +02:00 · 2021-04-20 18:52:34 -04:00
parent b189c7b472
commit ae4f68f695
193 changed files with 1381 additions and 1897 deletions
--- a/patch/patches/chrome_runtime.patch
+++ b/patch/patches/chrome_runtime.patch
@ -1,5 +1,5 @@
 diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
-index 826ef32f3033..238750f1c2ba 100644
+index 94e871ea16b08..69929718b2704 100644
 --- chrome/app/chrome_main_delegate.cc
 +++ chrome/app/chrome_main_delegate.cc
@@ -29,6 +29,7 @@
@ -19,7 +19,7 @@ index 826ef32f3033..238750f1c2ba 100644
 #if defined(OS_WIN)
   // Reach out to chrome_elf for the truth on the user data directory.
   // Note that in tests, this links to chrome_elf_test_stubs.
-@@ -657,7 +660,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
+@@ -662,7 +665,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
   }
 
 #if defined(OS_WIN)
@ -29,7 +29,7 @@ index 826ef32f3033..238750f1c2ba 100644
   base::sequence_manager::internal::ThreadControllerPowerMonitor::
       InitializeOnMainThread();
 #endif
-@@ -950,6 +955,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -955,6 +960,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
@ -37,7 +37,7 @@ index 826ef32f3033..238750f1c2ba 100644
   crash_reporter::InitializeCrashKeys();
 
 #if defined(OS_POSIX)
-@@ -960,6 +966,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -965,6 +971,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   InitMacCrashReporter(command_line, process_type);
   SetUpInstallerPreferences(command_line);
 #endif
@ -45,7 +45,7 @@ index 826ef32f3033..238750f1c2ba 100644
 
 #if defined(OS_WIN)
   child_process_logging::Init();
-@@ -1083,6 +1090,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1088,6 +1095,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
         locale;
   }
 
@ -53,7 +53,7 @@ index 826ef32f3033..238750f1c2ba 100644
 #if defined(OS_POSIX) && !defined(OS_MAC)
   // Zygote needs to call InitCrashReporter() in RunZygote().
   if (process_type != switches::kZygoteProcess) {
-@@ -1115,6 +1123,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1120,6 +1128,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   // After all the platform Breakpads have been initialized, store the command
   // line for crash reporting.
   crash_keys::SetCrashKeysFromCommandLine(command_line);
@ -61,7 +61,7 @@ index 826ef32f3033..238750f1c2ba 100644
 
 #if BUILDFLAG(ENABLE_PDF)
   MaybeInitializeGDI();
-@@ -1213,6 +1222,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1218,6 +1227,7 @@ void ChromeMainDelegate::ZygoteForked() {
     SetUpProfilingShutdownHandler();
   }
 
@ -69,7 +69,7 @@ index 826ef32f3033..238750f1c2ba 100644
   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
   // this up for the browser process in a different manner.
   const base::CommandLine* command_line =
-@@ -1229,6 +1239,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1234,6 +1244,7 @@ void ChromeMainDelegate::ZygoteForked() {
 
   // Reset the command line for the newly spawned process.
   crash_keys::SetCrashKeysFromCommandLine(*command_line);
@ -78,7 +78,7 @@ index 826ef32f3033..238750f1c2ba 100644
 
 #endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
-index 65465803bd38..b521fd91a93b 100644
+index 86b9a324e5da5..b4e1bfebe1162 100644
 --- chrome/browser/chrome_browser_main.cc
 +++ chrome/browser/chrome_browser_main.cc
@@ -49,6 +49,7 @@
@ -89,35 +89,36 @@ index 65465803bd38..b521fd91a93b 100644
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/active_use_util.h"
 #include "chrome/browser/after_startup_task_utils.h"
-@@ -900,8 +901,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -896,8 +897,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.
 +  // CEF with the Chrome runtime will create and manage its own RunLoop.
-   DCHECK(!g_run_loop);
-  g_run_loop = new base::RunLoop;
+   DCHECK(!GetMainRunLoopInstance());
+-  GetMainRunLoopInstance() = std::make_unique<base::RunLoop>();
 +  if (!cef::IsChromeRuntimeEnabled())
-+    g_run_loop = new base::RunLoop;
+    GetMainRunLoopInstance() = std::make_unique<base::RunLoop>();
 
   // These members must be initialized before returning from this function.
   // Android doesn't use StartupBrowserCreator.
-@@ -1633,11 +1636,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1639,11 +1642,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|.
-+  // Bypass StartupBrowserCreator with CEF where |g_run_loop| is nullptr.
+  // Bypass StartupBrowserCreator with CEF where |GetMainRunLoopInstance()| is
+  // nullptr.
   const bool started =
-+      !g_run_loop ||
+      !GetMainRunLoopInstance() ||
       !process_command_line ||
       browser_creator_->Start(parsed_command_line(), base::FilePath(), profile_,
                               last_opened_profiles);
 -  if (started) {
-+  if (started && g_run_loop) {
+  if (started && GetMainRunLoopInstance()) {
 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
 // of lacros-chrome is complete.
 #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
-index 8a33ce57766c..ca69a37eee22 100644
+index 8a33ce57766c5..ca69a37eee22b 100644
 --- chrome/browser/chrome_browser_main_mac.mm
 +++ chrome/browser/chrome_browser_main_mac.mm
@@ -16,6 +16,7 @@
@ -128,7 +129,7 @@ index 8a33ce57766c..ca69a37eee22 100644
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/apps/app_shim/app_shim_listener.h"
 #include "chrome/browser/browser_process.h"
-@@ -110,6 +111,7 @@
+@@ -110,6 +111,7 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
     }
   }
 
@ -136,7 +137,7 @@ index 8a33ce57766c..ca69a37eee22 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];
-@@ -118,6 +120,7 @@
+@@ -118,6 +120,7 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
   chrome::BuildMainMenu(NSApp, app_controller,
                         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false);
   [app_controller mainMenuCreated];
@ -144,7 +145,7 @@ index 8a33ce57766c..ca69a37eee22 100644
 
   PrefService* local_state = g_browser_process->local_state();
   DCHECK(local_state);
-@@ -170,7 +173,9 @@
+@@ -170,7 +173,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit() {
 }
 
 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
@ -155,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 29ba5f21b38f..3ce05420eb78 100644
+index 3f152fd798e8c..19346821464f5 100644
 --- chrome/browser/chrome_content_browser_client.cc
 +++ chrome/browser/chrome_content_browser_client.cc
@@ -37,6 +37,7 @@
@ -166,7 +167,7 @@ index 29ba5f21b38f..3ce05420eb78 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"
-@@ -3591,9 +3592,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
+@@ -3643,9 +3644,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
                           &search::HandleNewTabURLReverseRewrite);
 #endif  // defined(OS_ANDROID)
 
@ -179,7 +180,7 @@ index 29ba5f21b38f..3ce05420eb78 100644
 
 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
 diff --git chrome/browser/notifications/alert_dispatcher_xpc.mm chrome/browser/notifications/alert_dispatcher_xpc.mm
-index d126ddd3a24d..5e8c5ae7c093 100644
+index d126ddd3a24dd..5e8c5ae7c093a 100644
 --- chrome/browser/notifications/alert_dispatcher_xpc.mm
 +++ chrome/browser/notifications/alert_dispatcher_xpc.mm
@@ -19,6 +19,7 @@
@ -190,7 +191,7 @@ index d126ddd3a24d..5e8c5ae7c093 100644
 #include "chrome/browser/notifications/notification_platform_bridge_mac_utils.h"
 #import "chrome/browser/ui/cocoa/notifications/notification_delivery.h"
 #include "chrome/browser/ui/cocoa/notifications/xpc_mach_port.h"
-@@ -180,6 +181,12 @@ - (void)notificationClick:(NSDictionary*)notificationResponseData {
+@@ -180,6 +181,12 @@ void RecordXPCEvent(XPCConnectionEvent event) {
 - (id<NotificationDelivery>)serviceProxy {
   id<NotificationDelivery> proxy = [_xpcConnection remoteObjectProxy];
 
@ -204,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 fbfeff04ce25..f5ab9f9bb8cf 100644
+index 7f814486ab674..512dbd488d752 100644
 --- chrome/browser/prefs/browser_prefs.cc
 +++ chrome/browser/prefs/browser_prefs.cc
@@ -10,6 +10,7 @@
@ -215,7 +216,7 @@ index fbfeff04ce25..f5ab9f9bb8cf 100644
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/accessibility/accessibility_labels_service.h"
 #include "chrome/browser/accessibility/accessibility_ui.h"
-@@ -160,6 +161,10 @@
+@@ -159,6 +160,10 @@
 #include "chrome/browser/background/background_mode_manager.h"
 #endif
 
@ -226,7 +227,7 @@ index fbfeff04ce25..f5ab9f9bb8cf 100644
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/accessibility/animation_policy_prefs.h"
 #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
-@@ -959,6 +964,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -974,6 +979,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   RegisterSessionServiceLogProfilePrefs(registry);
 #endif