Index: content/child/scheduler/webthread_impl_for_worker_scheduler.cc |
diff --git a/content/child/scheduler/webthread_impl_for_worker_scheduler.cc b/content/child/scheduler/webthread_impl_for_worker_scheduler.cc |
index 20379b1212f2ffaa05b2850e4326355412a1ebca..a838c45dc0c0a42de5c145a636034933d25bee09 100644 |
--- a/content/child/scheduler/webthread_impl_for_worker_scheduler.cc |
+++ b/content/child/scheduler/webthread_impl_for_worker_scheduler.cc |
@@ -8,6 +8,7 @@ |
#include "base/synchronization/waitable_event.h" |
#include "content/child/scheduler/scheduler_message_loop_delegate.h" |
#include "content/child/scheduler/worker_scheduler_impl.h" |
+#include "content/child/scheduler/worker_web_scheduler_impl.h" |
#include "third_party/WebKit/public/platform/WebTraceLocation.h" |
namespace content { |
@@ -42,6 +43,7 @@ void WebThreadImplForWorkerScheduler::InitOnThread( |
worker_scheduler_->Init(); |
task_runner_ = worker_scheduler_->DefaultTaskRunner(); |
idle_task_runner_ = worker_scheduler_->IdleTaskRunner(); |
+ web_scheduler_.reset(new WorkerWebSchedulerImpl(worker_scheduler_.get())); |
completion->Signal(); |
} |
@@ -50,6 +52,7 @@ void WebThreadImplForWorkerScheduler::ShutDownOnThread( |
task_runner_ = nullptr; |
idle_task_runner_ = nullptr; |
worker_scheduler_.reset(nullptr); |
+ web_scheduler_.reset(nullptr); |
Sami
2015/04/15 12:37:13
WorkerWebSchedulerImpl should be destructed before
alex clarke (OOO till 29th)
2015/04/15 14:25:46
Done.
|
completion->Signal(); |
} |
@@ -57,6 +60,10 @@ blink::PlatformThreadId WebThreadImplForWorkerScheduler::threadId() const { |
return thread_->thread_id(); |
} |
+blink::WebScheduler* WebThreadImplForWorkerScheduler::scheduler() const { |
+ return web_scheduler_.get(); |
+} |
+ |
base::MessageLoop* WebThreadImplForWorkerScheduler::MessageLoop() const { |
// As per WebThreadImpl::MessageLoop() |
return nullptr; |