diff options
Diffstat (limited to 'chromium/content/browser/scheduler')
3 files changed, 13 insertions, 17 deletions
diff --git a/chromium/content/browser/scheduler/browser_task_executor.cc b/chromium/content/browser/scheduler/browser_task_executor.cc index 332ef34e24d..df3ab602e8b 100644 --- a/chromium/content/browser/scheduler/browser_task_executor.cc +++ b/chromium/content/browser/scheduler/browser_task_executor.cc @@ -96,10 +96,6 @@ BaseBrowserTaskExecutor::CreateCOMSTATaskRunner( scoped_refptr<base::SingleThreadTaskRunner> BaseBrowserTaskExecutor::GetTaskRunner(BrowserThread::ID identifier, const base::TaskTraits& traits) const { - DCHECK(traits.extension_id() == - base::TaskTraitsExtensionStorage::kInvalidExtensionId || - ExtractBrowserThreadId(traits) == identifier); - const QueueType queue_type = GetQueueType(traits); switch (identifier) { diff --git a/chromium/content/browser/scheduler/browser_task_executor_unittest.cc b/chromium/content/browser/scheduler/browser_task_executor_unittest.cc index febb15222e7..5c9477066f8 100644 --- a/chromium/content/browser/scheduler/browser_task_executor_unittest.cc +++ b/chromium/content/browser/scheduler/browser_task_executor_unittest.cc @@ -120,6 +120,16 @@ TEST_F(BrowserTaskExecutorTest, RunAllPendingTasksForTestingOnIOIsReentrant) { BrowserTaskExecutor::RunAllPendingTasksOnThreadForTesting(BrowserThread::IO); } +TEST_F(BrowserTaskExecutorTest, GetTaskRunnerWithBrowserTaskTraits) { + StrictMockTask task_1; + + GetUIThreadTaskRunner({BrowserTaskType::kPreconnect}) + ->PostTask(FROM_HERE, task_1.Get()); + + EXPECT_CALL(task_1, Run); + BrowserTaskExecutor::RunAllPendingTasksOnThreadForTesting(BrowserThread::UI); +} + // Helper to perform the same tets for all BrowserThread::ID values. class BrowserTaskTraitsMappingTest : public BrowserTaskExecutorTest { protected: diff --git a/chromium/content/browser/scheduler/responsiveness/watcher.cc b/chromium/content/browser/scheduler/responsiveness/watcher.cc index 77d295b7bbb..9ad41b5bcaa 100644 --- a/chromium/content/browser/scheduler/responsiveness/watcher.cc +++ b/chromium/content/browser/scheduler/responsiveness/watcher.cc @@ -98,15 +98,9 @@ void Watcher::DidRunTask(const base::PendingTask* task, if (UNLIKELY(currently_running_metadata->empty() || (task != currently_running_metadata->back().identifier))) { *mismatched_task_identifiers += 1; - // Mismatches can happen (e.g: on ozone/wayland when Paste button is pressed - // in context menus, among others). Simply ignore the mismatches for now. - // See https://crbug.com/929813 for the details of why the mismatch - // happens. -#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) - return currently_running_metadata_ui_.clear(); -#endif - DCHECK_LE(*mismatched_task_identifiers, 1); - return; + // Mismatches can happen, so just ignore them for now. See + // https://crbug.com/929813 and https://crbug.com/931874 for details. + return currently_running_metadata->clear(); } const Metadata metadata = currently_running_metadata->back(); @@ -171,11 +165,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque_identifier) { mismatched_event_identifiers_ui_ += 1; // See comment in DidRunTask() for why |currently_running_metadata_ui_| may // be reset. -#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) return currently_running_metadata_ui_.clear(); -#endif - DCHECK_LE(mismatched_event_identifiers_ui_, 1); - return; } const bool caused_reentrancy = |