Update to Chromium version 134.0.6998.0 (#1415337)

This commit is contained in:
Marshall Greenblatt
2025-02-12 12:35:33 -05:00
parent c8be96d15c
commit c7c6a109c9
88 changed files with 736 additions and 793 deletions

View File

@ -1,13 +1,16 @@
diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc
index aecccefd0dfa1..72c287317da0c 100644
index d2a1fe5b3d301..4e49261495260 100644
--- content/browser/scheduler/browser_task_executor.cc
+++ content/browser/scheduler/browser_task_executor.cc
@@ -207,7 +207,7 @@ BrowserTaskExecutor::OnUserInputStart() {
@@ -183,10 +183,9 @@ void BrowserTaskExecutor::ResetForTesting() {
// static
void BrowserTaskExecutor::Shutdown() {
- if (!g_browser_task_executor)
+ if (!g_browser_task_executor || !g_browser_task_executor->ui_thread_executor_)
+ if (!g_browser_task_executor || !Get()->browser_ui_thread_scheduler_)
return;
DCHECK(Get()->ui_thread_executor_);
- DCHECK(Get()->browser_ui_thread_scheduler_);
// We don't delete |g_browser_task_executor| because other threads may
// PostTask or call BrowserTaskExecutor::GetTaskRunner while we're tearing
// things down. We don't want to add locks so we just leak instead of dealing