Index: cc/CCThreadTask.h |
diff --git a/cc/CCThreadTask.h b/cc/CCThreadTask.h |
index 25c5509d5c6c94137f20364b2392458b7198cefc..561156b712a7b3e0786e9a9720ee9727ea5ada33 100644 |
--- a/cc/CCThreadTask.h |
+++ b/cc/CCThreadTask.h |
@@ -1,305 +1,6 @@ |
-// Copyright 2011 The Chromium Authors. All rights reserved. |
+// Copyright 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. |
-#ifndef CCThreadTask_h |
-#define CCThreadTask_h |
-#include "CCThread.h" |
-#include <wtf/PassOwnPtr.h> |
-#include <wtf/PassRefPtr.h> |
- |
-namespace cc { |
- |
-template<typename T> |
-class CCThreadTask0 : public CCThread::Task { |
-public: |
- typedef void (T::*Method)(); |
- typedef CCThreadTask0<T> CCThreadTaskImpl; |
- |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method) |
- { |
- return adoptPtr(new CCThreadTaskImpl(instance, method)); |
- } |
- |
-private: |
- CCThreadTask0(T* instance, Method method) |
- : CCThread::Task(instance) |
- , m_method(method) |
- { |
- } |
- |
- virtual void performTask() OVERRIDE |
- { |
- (*static_cast<T*>(instance()).*m_method)(); |
- } |
- |
-private: |
- Method m_method; |
-}; |
- |
-template<typename T, typename P1, typename MP1> |
-class CCThreadTask1 : public CCThread::Task { |
-public: |
- typedef void (T::*Method)(MP1); |
- typedef CCThreadTask1<T, P1, MP1> CCThreadTaskImpl; |
- |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method, P1 parameter1) |
- { |
- return adoptPtr(new CCThreadTaskImpl(instance, method, parameter1)); |
- } |
- |
-private: |
- CCThreadTask1(T* instance, Method method, P1 parameter1) |
- : CCThread::Task(instance) |
- , m_method(method) |
- , m_parameter1(parameter1) |
- { |
- } |
- |
- virtual void performTask() OVERRIDE |
- { |
- (*static_cast<T*>(instance()).*m_method)(m_parameter1); |
- } |
- |
-private: |
- Method m_method; |
- P1 m_parameter1; |
-}; |
- |
-template<typename T, typename P1, typename MP1, typename P2, typename MP2> |
-class CCThreadTask2 : public CCThread::Task { |
-public: |
- typedef void (T::*Method)(MP1, MP2); |
- typedef CCThreadTask2<T, P1, MP1, P2, MP2> CCThreadTaskImpl; |
- |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2) |
- { |
- return adoptPtr(new CCThreadTaskImpl(instance, method, parameter1, parameter2)); |
- } |
- |
-private: |
- CCThreadTask2(T* instance, Method method, P1 parameter1, P2 parameter2) |
- : CCThread::Task(instance) |
- , m_method(method) |
- , m_parameter1(parameter1) |
- , m_parameter2(parameter2) |
- { |
- } |
- |
- virtual void performTask() OVERRIDE |
- { |
- (*static_cast<T*>(instance()).*m_method)(m_parameter1, m_parameter2); |
- } |
- |
-private: |
- Method m_method; |
- P1 m_parameter1; |
- P2 m_parameter2; |
-}; |
- |
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3> |
-class CCThreadTask3 : public CCThread::Task { |
-public: |
- typedef void (T::*Method)(MP1, MP2, MP3); |
- typedef CCThreadTask3<T, P1, MP1, P2, MP2, P3, MP3> CCThreadTaskImpl; |
- |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3) |
- { |
- return adoptPtr(new CCThreadTaskImpl(instance, method, parameter1, parameter2, parameter3)); |
- } |
- |
-private: |
- CCThreadTask3(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3) |
- : CCThread::Task(instance) |
- , m_method(method) |
- , m_parameter1(parameter1) |
- , m_parameter2(parameter2) |
- , m_parameter3(parameter3) |
- { |
- } |
- |
- virtual void performTask() OVERRIDE |
- { |
- (*static_cast<T*>(instance()).*m_method)(m_parameter1, m_parameter2, m_parameter3); |
- } |
- |
-private: |
- Method m_method; |
- P1 m_parameter1; |
- P2 m_parameter2; |
- P3 m_parameter3; |
-}; |
- |
- |
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4> |
-class CCThreadTask4 : public CCThread::Task { |
-public: |
- typedef void (T::*Method)(MP1, MP2, MP3, MP4); |
- typedef CCThreadTask4<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4> CCThreadTaskImpl; |
- |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3, P4 parameter4) |
- { |
- return adoptPtr(new CCThreadTaskImpl(instance, method, parameter1, parameter2, parameter3, parameter4)); |
- } |
- |
-private: |
- CCThreadTask4(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3, P4 parameter4) |
- : CCThread::Task(instance) |
- , m_method(method) |
- , m_parameter1(parameter1) |
- , m_parameter2(parameter2) |
- , m_parameter3(parameter3) |
- , m_parameter4(parameter4) |
- { |
- } |
- |
- virtual void performTask() OVERRIDE |
- { |
- (*static_cast<T*>(instance()).*m_method)(m_parameter1, m_parameter2, m_parameter3, m_parameter4); |
- } |
- |
-private: |
- Method m_method; |
- P1 m_parameter1; |
- P2 m_parameter2; |
- P3 m_parameter3; |
- P4 m_parameter4; |
-}; |
- |
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5> |
-class CCThreadTask5 : public CCThread::Task { |
-public: |
- typedef void (T::*Method)(MP1, MP2, MP3, MP4, MP5); |
- typedef CCThreadTask5<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5> CCThreadTaskImpl; |
- |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3, P4 parameter4, P5 parameter5) |
- { |
- return adoptPtr(new CCThreadTaskImpl(instance, method, parameter1, parameter2, parameter3, parameter4, parameter5)); |
- } |
- |
-private: |
- CCThreadTask5(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3, P4 parameter4, P5 parameter5) |
- : CCThread::Task(instance) |
- , m_method(method) |
- , m_parameter1(parameter1) |
- , m_parameter2(parameter2) |
- , m_parameter3(parameter3) |
- , m_parameter4(parameter4) |
- , m_parameter5(parameter5) |
- { |
- } |
- |
- virtual void performTask() OVERRIDE |
- { |
- (*static_cast<T*>(instance()).*m_method)(m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5); |
- } |
- |
-private: |
- Method m_method; |
- P1 m_parameter1; |
- P2 m_parameter2; |
- P3 m_parameter3; |
- P4 m_parameter4; |
- P5 m_parameter5; |
-}; |
- |
-template<typename T> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
- T* const callee, |
- void (T::*method)()); |
- |
-template<typename T> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
- T* const callee, |
- void (T::*method)()) |
-{ |
- return CCThreadTask0<T>::create( |
- callee, |
- method); |
-} |
- |
-template<typename T, typename P1, typename MP1> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
- T* const callee, |
- void (T::*method)(MP1), |
- const P1& parameter1) |
-{ |
- return CCThreadTask1<T, P1, MP1>::create( |
- callee, |
- method, |
- parameter1); |
-} |
- |
-template<typename T, typename P1, typename MP1, typename P2, typename MP2> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
- T* const callee, |
- void (T::*method)(MP1, MP2), |
- const P1& parameter1, |
- const P2& parameter2) |
-{ |
- return CCThreadTask2<T, P1, MP1, P2, MP2>::create( |
- callee, |
- method, |
- parameter1, |
- parameter2); |
-} |
- |
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
- T* const callee, |
- void (T::*method)(MP1, MP2, MP3), |
- const P1& parameter1, |
- const P2& parameter2, |
- const P3& parameter3) |
-{ |
- return CCThreadTask3<T, P1, MP1, P2, MP2, P3, MP3>::create( |
- callee, |
- method, |
- parameter1, |
- parameter2, |
- parameter3); |
-} |
- |
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
- T* const callee, |
- void (T::*method)(MP1, MP2, MP3, MP4), |
- const P1& parameter1, |
- const P2& parameter2, |
- const P3& parameter3, |
- const P4& parameter4) |
-{ |
- return CCThreadTask4<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4>::create( |
- callee, |
- method, |
- parameter1, |
- parameter2, |
- parameter3, |
- parameter4); |
- |
-} |
- |
-template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
- T* const callee, |
- void (T::*method)(MP1, MP2, MP3, MP4, MP5), |
- const P1& parameter1, |
- const P2& parameter2, |
- const P3& parameter3, |
- const P4& parameter4, |
- const P5& parameter5) |
-{ |
- return CCThreadTask5<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5>::create( |
- callee, |
- method, |
- parameter1, |
- parameter2, |
- parameter3, |
- parameter4, |
- parameter5); |
- |
-} |
- |
-} // namespace cc |
- |
-#endif // CCThreadTask_h |
+// Temporary forwarding header |
+#include "cc/thread_task.h" |