| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "CCThreadImpl.h" | 6 #include "CCThreadImpl.h" |
| 7 | 7 |
| 8 #include "cc/completion_event.h" | 8 #include "cc/completion_event.h" |
| 9 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" | 9 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" |
| 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h" | 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h" |
| 11 | 11 |
| 12 using cc::CCThread; | 12 using cc::Thread; |
| 13 using cc::CCCompletionEvent; | 13 using cc::CompletionEvent; |
| 14 | 14 |
| 15 namespace WebKit { | 15 namespace WebKit { |
| 16 | 16 |
| 17 // Task that, when runs, places the current thread ID into the provided | 17 // Task that, when runs, places the current thread ID into the provided |
| 18 // pointer and signals a completion event. | 18 // pointer and signals a completion event. |
| 19 // | 19 // |
| 20 // Does not provide a PassOwnPtr<GetThreadIDTask>::create method because | 20 // Does not provide a PassOwnPtr<GetThreadIDTask>::create method because |
| 21 // the resulting object is always handed into a WebThread, which does not unders
tand | 21 // the resulting object is always handed into a WebThread, which does not unders
tand |
| 22 // PassOwnPtrs. | 22 // PassOwnPtrs. |
| 23 class GetThreadIDTask : public WebThread::Task { | 23 class GetThreadIDTask : public WebThread::Task { |
| 24 public: | 24 public: |
| 25 GetThreadIDTask(base::PlatformThreadId* result, CCCompletionEvent* completio
n) | 25 GetThreadIDTask(base::PlatformThreadId* result, CompletionEvent* completion) |
| 26 : m_completion(completion) | 26 : m_completion(completion) |
| 27 , m_result(result) { } | 27 , m_result(result) { } |
| 28 | 28 |
| 29 virtual ~GetThreadIDTask() { } | 29 virtual ~GetThreadIDTask() { } |
| 30 | 30 |
| 31 virtual void run() | 31 virtual void run() |
| 32 { | 32 { |
| 33 *m_result = base::PlatformThread::CurrentId(); | 33 *m_result = base::PlatformThread::CurrentId(); |
| 34 m_completion->signal(); | 34 m_completion->signal(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 private: | 37 private: |
| 38 CCCompletionEvent* m_completion; | 38 CompletionEvent* m_completion; |
| 39 base::PlatformThreadId* m_result; | 39 base::PlatformThreadId* m_result; |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 // General adapter from a CCThread::Task to a WebThread::Task. | 42 // General adapter from a Thread::Task to a WebThread::Task. |
| 43 class CCThreadTaskAdapter : public WebThread::Task { | 43 class ThreadTaskAdapter : public WebThread::Task { |
| 44 public: | 44 public: |
| 45 explicit CCThreadTaskAdapter(PassOwnPtr<CCThread::Task> task) : m_task(task)
{ } | 45 explicit ThreadTaskAdapter(PassOwnPtr<Thread::Task> task) : m_task(task) { } |
| 46 | 46 |
| 47 virtual ~CCThreadTaskAdapter() { } | 47 virtual ~ThreadTaskAdapter() { } |
| 48 | 48 |
| 49 virtual void run() | 49 virtual void run() |
| 50 { | 50 { |
| 51 m_task->performTask(); | 51 m_task->performTask(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 private: | 54 private: |
| 55 OwnPtr<CCThread::Task> m_task; | 55 OwnPtr<Thread::Task> m_task; |
| 56 }; | 56 }; |
| 57 | 57 |
| 58 scoped_ptr<CCThread> CCThreadImpl::createForCurrentThread() | 58 scoped_ptr<Thread> CCThreadImpl::createForCurrentThread() |
| 59 { | 59 { |
| 60 return scoped_ptr<CCThread>(new CCThreadImpl(Platform::current()->currentThr
ead(), true)).Pass(); | 60 return scoped_ptr<Thread>(new CCThreadImpl(Platform::current()->currentThrea
d(), true)).Pass(); |
| 61 } | 61 } |
| 62 | 62 |
| 63 scoped_ptr<CCThread> CCThreadImpl::createForDifferentThread(WebThread* thread) | 63 scoped_ptr<Thread> CCThreadImpl::createForDifferentThread(WebThread* thread) |
| 64 { | 64 { |
| 65 return scoped_ptr<CCThread>(new CCThreadImpl(thread, false)).Pass(); | 65 return scoped_ptr<Thread>(new CCThreadImpl(thread, false)).Pass(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 CCThreadImpl::~CCThreadImpl() | 68 CCThreadImpl::~CCThreadImpl() |
| 69 { | 69 { |
| 70 } | 70 } |
| 71 | 71 |
| 72 void CCThreadImpl::postTask(PassOwnPtr<CCThread::Task> task) | 72 void CCThreadImpl::postTask(PassOwnPtr<Thread::Task> task) |
| 73 { | 73 { |
| 74 m_thread->postTask(new CCThreadTaskAdapter(task)); | 74 m_thread->postTask(new ThreadTaskAdapter(task)); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void CCThreadImpl::postDelayedTask(PassOwnPtr<CCThread::Task> task, long long de
layMs) | 77 void CCThreadImpl::postDelayedTask(PassOwnPtr<Thread::Task> task, long long dela
yMs) |
| 78 { | 78 { |
| 79 m_thread->postDelayedTask(new CCThreadTaskAdapter(task), delayMs); | 79 m_thread->postDelayedTask(new ThreadTaskAdapter(task), delayMs); |
| 80 } | 80 } |
| 81 | 81 |
| 82 base::PlatformThreadId CCThreadImpl::threadID() const | 82 base::PlatformThreadId CCThreadImpl::threadID() const |
| 83 { | 83 { |
| 84 return m_threadID; | 84 return m_threadID; |
| 85 } | 85 } |
| 86 | 86 |
| 87 CCThreadImpl::CCThreadImpl(WebThread* thread, bool currentThread) | 87 CCThreadImpl::CCThreadImpl(WebThread* thread, bool currentThread) |
| 88 : m_thread(thread) | 88 : m_thread(thread) |
| 89 { | 89 { |
| 90 if (currentThread) { | 90 if (currentThread) { |
| 91 m_threadID = base::PlatformThread::CurrentId(); | 91 m_threadID = base::PlatformThread::CurrentId(); |
| 92 return; | 92 return; |
| 93 } | 93 } |
| 94 | 94 |
| 95 // Get the threadId for the newly-created thread by running a task | 95 // Get the threadId for the newly-created thread by running a task |
| 96 // on that thread, blocking on the result. | 96 // on that thread, blocking on the result. |
| 97 CCCompletionEvent completion; | 97 CompletionEvent completion; |
| 98 m_thread->postTask(new GetThreadIDTask(&m_threadID, &completion)); | 98 m_thread->postTask(new GetThreadIDTask(&m_threadID, &completion)); |
| 99 completion.wait(); | 99 completion.wait(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 } // namespace WebKit | 102 } // namespace WebKit |
| OLD | NEW |