Add support for Run + Quit to WebKit::WebThread

webkit/glue/webthread_impl.cc

 // Copyright (c) 2012 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 "webkit/glue/webthread_impl.h"
 
 #include "base/bind.h"
@@ skipping 52 matching lines @@
 }
 
 void WebThreadImpl::postDelayedTask(
     Task* task, long long delay_ms) {
   thread_->message_loop()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&WebKit::WebThread::Task::run, base::Owned(task)),
       base::TimeDelta::FromMilliseconds(delay_ms));
 }
 
+void WebThreadImpl::enterRunLoop() {
+  CHECK(IsCurrentThread());
+  CHECK(!thread_->message_loop()->is_running()); // We don't support nesting.
+  thread_->message_loop()->Run();
+}
+
+void WebThreadImpl::exitRunLoop() {
+  CHECK(IsCurrentThread());
+  CHECK(thread_->message_loop()->is_running());
+  thread_->message_loop()->Quit();
+}
+
 bool WebThreadImpl::IsCurrentThread() const {
   return thread_->thread_id() == base::PlatformThread::CurrentId();
 }
 
 WebThreadImpl::~WebThreadImpl() {
   thread_->Stop();
 }
 
 WebThreadImplForMessageLoop::WebThreadImplForMessageLoop(
-    base::MessageLoopProxy* message_loop)
-    : message_loop_(message_loop) {
+        MessageLoop* message_loop, base::PlatformThreadId thread_id)
+    : message_loop_(message_loop)
+    , thread_id_(thread_id) {
 }
 
 void WebThreadImplForMessageLoop::postTask(Task* task) {
   message_loop_->PostTask(
       FROM_HERE, base::Bind(&WebKit::WebThread::Task::run, base::Owned(task)));
 }
 
 void WebThreadImplForMessageLoop::postDelayedTask(
     Task* task, long long delay_ms) {
   message_loop_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&WebKit::WebThread::Task::run, base::Owned(task)),
       delay_ms);
 }
 
+void WebThreadImplForMessageLoop::enterRunLoop() {
+  CHECK(IsCurrentThread());
+  CHECK(!message_loop_->is_running()); // We don't support nesting.
+  message_loop_->Run();

[darin (slow to review), 2012/01/19 17:57:36]

you could also just use MessageLoop::current()->Run() assuming you knew already
that you were on the correct thread.  this means that you can continue using
MessageLoopProxy for background thread access (postTask).

+}
+
+void WebThreadImplForMessageLoop::exitRunLoop() {
+  CHECK(IsCurrentThread());
+  CHECK(message_loop_->is_running());
+  message_loop_->Quit();
+}
+
 bool WebThreadImplForMessageLoop::IsCurrentThread() const {
-  return message_loop_->BelongsToCurrentThread();
+  return thread_id_ == base::PlatformThread::CurrentId();
 }
 
 WebThreadImplForMessageLoop::~WebThreadImplForMessageLoop() {
 }
 
 }