Refactor WebThreadImpl

content/child/webthread_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // An implementation of WebThread in terms of base::MessageLoop and
 // base::Thread
 
 #include "content/child/webthread_impl.h"
 
 #include "base/bind.h"
@@ skipping 48 matching lines @@
 void WebThreadBase::AddTaskObserverInternal(
     base::MessageLoop::TaskObserver* observer) {
   base::MessageLoop::current()->AddTaskObserver(observer);
 }
 
 void WebThreadBase::RemoveTaskObserverInternal(
     base::MessageLoop::TaskObserver* observer) {
   base::MessageLoop::current()->RemoveTaskObserver(observer);
 }
 
-WebThreadImpl::WebThreadImpl(const char* name)
-    : thread_(new base::Thread(name)) {
-  thread_->Start();
-}
-
 // RunWebThreadTask takes the ownership of |task| from base::Closure and
 // deletes it on the first invocation of the closure for thread-safety.
 // base::Closure made from RunWebThreadTask is copyable but Closure::Run
 // should be called at most only once.
 // This is because WebThread::Task can contain RefPtr to a
 // thread-unsafe-reference-counted object (e.g. WorkerThreadTask can contain
 // RefPtr to WebKit's StringImpl), and if we don't delete |task| here,
 // it causes a race condition as follows:
 // [A] In task->run(), more RefPtr's to the refcounted object can be created,
 //     and the reference counter of the object can be modified via these
 //     RefPtr's (as intended) on the thread where the task is executed.
 // [B] However, base::Closure still retains the ownership of WebThread::Task
 //     even after RunWebThreadTask is called.
 //     When base::Closure is deleted, WebThread::Task is deleted and the
 //     reference counter of the object is decreased by one, possibly from a
 //     different thread from [A], which is a race condition.
 // Taking the ownership of |task| here by using scoped_ptr and base::Passed
 // removes the reference counter modification of [B] and the race condition.
 // When the closure never runs at all, the corresponding WebThread::Task is
 // destructed when base::Closure is deleted (like [B]). In this case, there
 // are no reference counter modification like [A] (because task->run() is not
 // executed), so there are no race conditions.
 // See https://crbug.com/390851 for more details.
 //
 // static
 void WebThreadBase::RunWebThreadTask(scoped_ptr<blink::WebThread::Task> task) {
     task->run();
 }
 
-void WebThreadImpl::postTask(Task* task) {
-  postDelayedTask(task, 0);
-}
-
-void WebThreadImpl::postTask(const blink::WebTraceLocation& location,
+void WebThreadBase::postTask(const blink::WebTraceLocation& location,
                              Task* task) {
   postDelayedTask(location, task, 0);
 }
 
-void WebThreadImpl::postDelayedTask(Task* task, long long delay_ms) {
-  thread_->message_loop()->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(RunWebThreadTask, base::Passed(make_scoped_ptr(task))),
-      base::TimeDelta::FromMilliseconds(delay_ms));
-}
-
-void WebThreadImpl::postDelayedTask(const blink::WebTraceLocation& web_location,
+void WebThreadBase::postDelayedTask(const blink::WebTraceLocation& web_location,
                                     Task* task,
                                     long long delay_ms) {
   tracked_objects::Location location(web_location.functionName(),
                                      web_location.fileName(), -1, nullptr);
-  thread_->message_loop()->PostDelayedTask(
+  TaskRunner()->PostDelayedTask(
       location,
       base::Bind(RunWebThreadTask, base::Passed(make_scoped_ptr(task))),
       base::TimeDelta::FromMilliseconds(delay_ms));
 }
 
-void WebThreadImpl::enterRunLoop() {
+void WebThreadBase::enterRunLoop() {
   CHECK(isCurrentThread());
-  CHECK(!thread_->message_loop()->is_running());  // We don't support nesting.
-  thread_->message_loop()->Run();
+  CHECK(!MessageLoop()->is_running());  // We don't support nesting.
+  MessageLoop()->Run();
 }
 
-void WebThreadImpl::exitRunLoop() {
+void WebThreadBase::exitRunLoop() {
   CHECK(isCurrentThread());
-  CHECK(thread_->message_loop()->is_running());
-  thread_->message_loop()->Quit();
+  CHECK(MessageLoop()->is_running());
+  MessageLoop()->Quit();
 }
 
-bool WebThreadImpl::isCurrentThread() const {
-  return thread_->thread_id() == base::PlatformThread::CurrentId();
+bool WebThreadBase::isCurrentThread() const {
+  return TaskRunner()->BelongsToCurrentThread();
 }
 
 blink::PlatformThreadId WebThreadImpl::threadId() const {
   return thread_->thread_id();
 }
 
+WebThreadImpl::WebThreadImpl(const char* name)
+    : thread_(new base::Thread(name)) {
+  thread_->Start();
+}
+
 WebThreadImpl::~WebThreadImpl() {
   thread_->Stop();
 }
 
+base::MessageLoop* WebThreadImpl::MessageLoop() const {
+  return thread_->message_loop();
+}
+
+base::SingleThreadTaskRunner* WebThreadImpl::TaskRunner() const {
+  return thread_->message_loop_proxy().get();
+}
+
 WebThreadImplForMessageLoop::WebThreadImplForMessageLoop(
     scoped_refptr<base::SingleThreadTaskRunner> owning_thread_task_runner)
     : owning_thread_task_runner_(owning_thread_task_runner),
       thread_id_(base::PlatformThread::CurrentId()) {
 }
 
-void WebThreadImplForMessageLoop::postTask(Task* task) {
-  postDelayedTask(task, 0);
-}
-
-void WebThreadImplForMessageLoop::postTask(
-    const blink::WebTraceLocation& location,
-    Task* task) {
-  postDelayedTask(location, task, 0);
-}
-
-void WebThreadImplForMessageLoop::postDelayedTask(Task* task,
-                                                  long long delay_ms) {
-  owning_thread_task_runner_->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(RunWebThreadTask, base::Passed(make_scoped_ptr(task))),
-      base::TimeDelta::FromMilliseconds(delay_ms));
-}
-
-void WebThreadImplForMessageLoop::postDelayedTask(
-    const blink::WebTraceLocation& web_location,
-    Task* task,
-    long long delay_ms) {
-  tracked_objects::Location location(web_location.functionName(),
-                                     web_location.fileName(), -1, nullptr);
-  owning_thread_task_runner_->PostDelayedTask(
-      location,
-      base::Bind(RunWebThreadTask, base::Passed(make_scoped_ptr(task))),
-      base::TimeDelta::FromMilliseconds(delay_ms));
-}
-
-void WebThreadImplForMessageLoop::enterRunLoop() {
-  CHECK(isCurrentThread());
-  // We don't support nesting.
-  CHECK(!base::MessageLoop::current()->is_running());
-  base::MessageLoop::current()->Run();
-}
-
-void WebThreadImplForMessageLoop::exitRunLoop() {
-  CHECK(isCurrentThread());
-  CHECK(base::MessageLoop::current()->is_running());
-  base::MessageLoop::current()->Quit();
-}
-
-bool WebThreadImplForMessageLoop::isCurrentThread() const {
-  return owning_thread_task_runner_->BelongsToCurrentThread();
-}
-
 blink::PlatformThreadId WebThreadImplForMessageLoop::threadId() const {
   return thread_id_;
 }
 
-WebThreadImplForMessageLoop::~WebThreadImplForMessageLoop() {}
+WebThreadImplForMessageLoop::~WebThreadImplForMessageLoop() {
+}
+
+base::MessageLoop* WebThreadImplForMessageLoop::MessageLoop() const {
+  DCHECK(isCurrentThread());
+  return base::MessageLoop::current();
+}
+
+base::SingleThreadTaskRunner* WebThreadImplForMessageLoop::TaskRunner() const {
+  return owning_thread_task_runner_.get();
+}
 
 }  // namespace content