diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/workers/worker_thread.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/workers/worker_thread.cc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/chromium/third_party/blink/renderer/core/workers/worker_thread.cc b/chromium/third_party/blink/renderer/core/workers/worker_thread.cc index 7a04127a614..d06931f255e 100644 --- a/chromium/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/chromium/third_party/blink/renderer/core/workers/worker_thread.cc @@ -45,6 +45,7 @@ #include "third_party/blink/renderer/core/inspector/worker_thread_debugger.h" #include "third_party/blink/renderer/core/loader/worker_resource_timing_notifier_impl.h" #include "third_party/blink/renderer/core/probe/core_probes.h" +#include "third_party/blink/renderer/core/workers/cross_thread_global_scope_creation_params_copier.h" #include "third_party/blink/renderer/core/workers/global_scope_creation_params.h" #include "third_party/blink/renderer/core/workers/worker_backing_thread.h" #include "third_party/blink/renderer/core/workers/worker_clients.h" @@ -188,10 +189,10 @@ void WorkerThread::Start( PostCrossThreadTask( *GetWorkerBackingThread().BackingThread().GetTaskRunner(), FROM_HERE, - CrossThreadBindOnce( - &WorkerThread::InitializeOnWorkerThread, CrossThreadUnretained(this), - WTF::Passed(std::move(global_scope_creation_params)), - thread_startup_data, WTF::Passed(std::move(devtools_params)))); + CrossThreadBindOnce(&WorkerThread::InitializeOnWorkerThread, + CrossThreadUnretained(this), + std::move(global_scope_creation_params), + thread_startup_data, std::move(devtools_params))); } void WorkerThread::EvaluateClassicScript( @@ -204,7 +205,7 @@ void WorkerThread::EvaluateClassicScript( *GetTaskRunner(TaskType::kDOMManipulation), FROM_HERE, CrossThreadBindOnce(&WorkerThread::EvaluateClassicScriptOnWorkerThread, CrossThreadUnretained(this), script_url, source_code, - WTF::Passed(std::move(cached_meta_data)), stack_id)); + std::move(cached_meta_data), stack_id)); } void WorkerThread::FetchAndRunClassicScript( @@ -221,8 +222,8 @@ void WorkerThread::FetchAndRunClassicScript( CrossThreadBindOnce( &WorkerThread::FetchAndRunClassicScriptOnWorkerThread, CrossThreadUnretained(this), script_url, - WTF::Passed(std::move(worker_main_script_load_params)), - WTF::Passed(std::move(outside_settings_object_data)), + std::move(worker_main_script_load_params), + std::move(outside_settings_object_data), WrapCrossThreadPersistent(outside_resource_timing_notifier), stack_id)); } @@ -242,8 +243,8 @@ void WorkerThread::FetchAndRunModuleScript( CrossThreadBindOnce( &WorkerThread::FetchAndRunModuleScriptOnWorkerThread, CrossThreadUnretained(this), script_url, - WTF::Passed(std::move(worker_main_script_load_params)), - WTF::Passed(std::move(outside_settings_object_data)), + std::move(worker_main_script_load_params), + std::move(outside_settings_object_data), WrapCrossThreadPersistent(outside_resource_timing_notifier), credentials_mode, reject_coep_unsafe_none.value())); } @@ -400,10 +401,6 @@ HashSet<WorkerThread*>& WorkerThread::WorkerThreads() { return threads; } -PlatformThreadId WorkerThread::GetPlatformThreadId() { - return GetWorkerBackingThread().BackingThread().ThreadId(); -} - bool WorkerThread::IsForciblyTerminated() { MutexLocker lock(mutex_); switch (exit_code_) { @@ -580,6 +577,7 @@ void WorkerThread::InitializeSchedulerOnWorkerThread( TaskType::kPostedMessage, TaskType::kRemoteEvent, TaskType::kUserInteraction, + TaskType::kWakeLock, TaskType::kWebGL, TaskType::kWebLocks, TaskType::kWebSocket, |