| Index: webkit/child/webthread_impl.h
|
| diff --git a/webkit/child/webthread_impl.h b/webkit/child/webthread_impl.h
|
| index 73f21c29dcb50ac8778337fe7b9cc67b4a1da268..3e83b2238533cd5d32c020aafe6f0e67ecd564f3 100644
|
| --- a/webkit/child/webthread_impl.h
|
| +++ b/webkit/child/webthread_impl.h
|
| @@ -13,7 +13,7 @@
|
|
|
| namespace webkit_glue {
|
|
|
| -class WebThreadBase : public blink::WebThread {
|
| +class WEBKIT_CHILD_EXPORT WebThreadBase : public blink::WebThread {
|
| public:
|
| virtual ~WebThreadBase();
|
|
|
| @@ -32,10 +32,10 @@ class WebThreadBase : public blink::WebThread {
|
| TaskObserverMap task_observer_map_;
|
| };
|
|
|
| -class WebThreadImpl : public WebThreadBase {
|
| +class WEBKIT_CHILD_EXPORT WebThreadImpl : public WebThreadBase {
|
| public:
|
| - WEBKIT_CHILD_EXPORT explicit WebThreadImpl(const char* name);
|
| - WEBKIT_CHILD_EXPORT virtual ~WebThreadImpl();
|
| + explicit WebThreadImpl(const char* name);
|
| + virtual ~WebThreadImpl();
|
|
|
| virtual void postTask(Task* task);
|
| virtual void postDelayedTask(Task* task, long long delay_ms);
|
| @@ -45,8 +45,9 @@ class WebThreadImpl : public WebThreadBase {
|
|
|
| base::MessageLoop* message_loop() const { return thread_->message_loop(); }
|
|
|
| - private:
|
| virtual bool isCurrentThread() const OVERRIDE;
|
| +
|
| + private:
|
| scoped_ptr<base::Thread> thread_;
|
| };
|
|
|
| @@ -56,11 +57,11 @@ class WebThreadImplForMessageLoop : public WebThreadBase {
|
| base::MessageLoopProxy* message_loop);
|
| WEBKIT_CHILD_EXPORT virtual ~WebThreadImplForMessageLoop();
|
|
|
| - virtual void postTask(Task* task);
|
| - virtual void postDelayedTask(Task* task, long long delay_ms);
|
| + virtual void postTask(Task* task) OVERRIDE;
|
| + virtual void postDelayedTask(Task* task, long long delay_ms) OVERRIDE;
|
|
|
| - virtual void enterRunLoop();
|
| - virtual void exitRunLoop();
|
| + virtual void enterRunLoop() OVERRIDE;
|
| + virtual void exitRunLoop() OVERRIDE;
|
|
|
| private:
|
| virtual bool isCurrentThread() const OVERRIDE;
|
|
|