| Index: webkit/glue/webthread_impl.h
|
| diff --git a/webkit/glue/webthread_impl.h b/webkit/glue/webthread_impl.h
|
| index e39d6bf65afdd87608b46dd3922877092349741c..4c15a7eecea36c47edaec367ef7be3ce4d3ed2cc 100644
|
| --- a/webkit/glue/webthread_impl.h
|
| +++ b/webkit/glue/webthread_impl.h
|
| @@ -7,6 +7,7 @@
|
| #include <map>
|
|
|
| #include "base/threading/thread.h"
|
| +#include "base/message_loop.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebThread.h"
|
| #include "webkit/glue/webkit_glue_export.h"
|
| @@ -40,6 +41,9 @@ class WebThreadImpl : public WebThreadBase {
|
| virtual void postTask(Task* task) OVERRIDE;
|
| virtual void postDelayedTask(Task* task, long long delay_ms) OVERRIDE;
|
|
|
| + virtual void enterRunLoop();
|
| + virtual void exitRunLoop();
|
| +
|
| MessageLoop* message_loop() const { return thread_->message_loop(); }
|
|
|
| private:
|
| @@ -49,15 +53,20 @@ class WebThreadImpl : public WebThreadBase {
|
|
|
| class WebThreadImplForMessageLoop : public WebThreadBase {
|
| public:
|
| - explicit WebThreadImplForMessageLoop(base::MessageLoopProxy* message_loop);
|
| + WebThreadImplForMessageLoop(MessageLoop* message_loop,
|
| + base::PlatformThreadId thread_id);
|
| virtual ~WebThreadImplForMessageLoop();
|
|
|
| virtual void postTask(Task* task) OVERRIDE;
|
| virtual void postDelayedTask(Task* task, long long delay_ms) OVERRIDE;
|
|
|
| + virtual void enterRunLoop();
|
| + virtual void exitRunLoop();
|
| +
|
| private:
|
| virtual bool IsCurrentThread() const OVERRIDE;
|
| - scoped_refptr<base::MessageLoopProxy> message_loop_;
|
| + MessageLoop* message_loop_;
|
| + base::PlatformThreadId thread_id_;
|
| };
|
|
|
| } // namespace webkit_glue
|
|
|