Index: cc/thread_task.h |
diff --git a/cc/thread_task.h b/cc/thread_task.h |
index 25c5509d5c6c94137f20364b2392458b7198cefc..84bb2889e042a23be4a17074983dab03f9614097 100644 |
--- a/cc/thread_task.h |
+++ b/cc/thread_task.h |
@@ -11,19 +11,19 @@ |
namespace cc { |
template<typename T> |
-class CCThreadTask0 : public CCThread::Task { |
+class ThreadTask0 : public Thread::Task { |
public: |
typedef void (T::*Method)(); |
- typedef CCThreadTask0<T> CCThreadTaskImpl; |
+ typedef ThreadTask0<T> ThreadTaskImpl; |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method) |
+ static PassOwnPtr<ThreadTaskImpl> create(T* instance, Method method) |
{ |
- return adoptPtr(new CCThreadTaskImpl(instance, method)); |
+ return adoptPtr(new ThreadTaskImpl(instance, method)); |
} |
private: |
- CCThreadTask0(T* instance, Method method) |
- : CCThread::Task(instance) |
+ ThreadTask0(T* instance, Method method) |
+ : Thread::Task(instance) |
, m_method(method) |
{ |
} |
@@ -38,19 +38,19 @@ private: |
}; |
template<typename T, typename P1, typename MP1> |
-class CCThreadTask1 : public CCThread::Task { |
+class ThreadTask1 : public Thread::Task { |
public: |
typedef void (T::*Method)(MP1); |
- typedef CCThreadTask1<T, P1, MP1> CCThreadTaskImpl; |
+ typedef ThreadTask1<T, P1, MP1> ThreadTaskImpl; |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method, P1 parameter1) |
+ static PassOwnPtr<ThreadTaskImpl> create(T* instance, Method method, P1 parameter1) |
{ |
- return adoptPtr(new CCThreadTaskImpl(instance, method, parameter1)); |
+ return adoptPtr(new ThreadTaskImpl(instance, method, parameter1)); |
} |
private: |
- CCThreadTask1(T* instance, Method method, P1 parameter1) |
- : CCThread::Task(instance) |
+ ThreadTask1(T* instance, Method method, P1 parameter1) |
+ : Thread::Task(instance) |
, m_method(method) |
, m_parameter1(parameter1) |
{ |
@@ -67,19 +67,19 @@ private: |
}; |
template<typename T, typename P1, typename MP1, typename P2, typename MP2> |
-class CCThreadTask2 : public CCThread::Task { |
+class ThreadTask2 : public Thread::Task { |
public: |
typedef void (T::*Method)(MP1, MP2); |
- typedef CCThreadTask2<T, P1, MP1, P2, MP2> CCThreadTaskImpl; |
+ typedef ThreadTask2<T, P1, MP1, P2, MP2> ThreadTaskImpl; |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2) |
+ static PassOwnPtr<ThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2) |
{ |
- return adoptPtr(new CCThreadTaskImpl(instance, method, parameter1, parameter2)); |
+ return adoptPtr(new ThreadTaskImpl(instance, method, parameter1, parameter2)); |
} |
private: |
- CCThreadTask2(T* instance, Method method, P1 parameter1, P2 parameter2) |
- : CCThread::Task(instance) |
+ ThreadTask2(T* instance, Method method, P1 parameter1, P2 parameter2) |
+ : Thread::Task(instance) |
, m_method(method) |
, m_parameter1(parameter1) |
, m_parameter2(parameter2) |
@@ -98,19 +98,19 @@ private: |
}; |
template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3> |
-class CCThreadTask3 : public CCThread::Task { |
+class ThreadTask3 : public Thread::Task { |
public: |
typedef void (T::*Method)(MP1, MP2, MP3); |
- typedef CCThreadTask3<T, P1, MP1, P2, MP2, P3, MP3> CCThreadTaskImpl; |
+ typedef ThreadTask3<T, P1, MP1, P2, MP2, P3, MP3> ThreadTaskImpl; |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3) |
+ static PassOwnPtr<ThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3) |
{ |
- return adoptPtr(new CCThreadTaskImpl(instance, method, parameter1, parameter2, parameter3)); |
+ return adoptPtr(new ThreadTaskImpl(instance, method, parameter1, parameter2, parameter3)); |
} |
private: |
- CCThreadTask3(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3) |
- : CCThread::Task(instance) |
+ ThreadTask3(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3) |
+ : Thread::Task(instance) |
, m_method(method) |
, m_parameter1(parameter1) |
, m_parameter2(parameter2) |
@@ -132,19 +132,19 @@ private: |
template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4> |
-class CCThreadTask4 : public CCThread::Task { |
+class ThreadTask4 : public Thread::Task { |
public: |
typedef void (T::*Method)(MP1, MP2, MP3, MP4); |
- typedef CCThreadTask4<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4> CCThreadTaskImpl; |
+ typedef ThreadTask4<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4> ThreadTaskImpl; |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3, P4 parameter4) |
+ static PassOwnPtr<ThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3, P4 parameter4) |
{ |
- return adoptPtr(new CCThreadTaskImpl(instance, method, parameter1, parameter2, parameter3, parameter4)); |
+ return adoptPtr(new ThreadTaskImpl(instance, method, parameter1, parameter2, parameter3, parameter4)); |
} |
private: |
- CCThreadTask4(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3, P4 parameter4) |
- : CCThread::Task(instance) |
+ ThreadTask4(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3, P4 parameter4) |
+ : Thread::Task(instance) |
, m_method(method) |
, m_parameter1(parameter1) |
, m_parameter2(parameter2) |
@@ -167,19 +167,19 @@ private: |
}; |
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 { |
+class ThreadTask5 : public Thread::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; |
+ typedef ThreadTask5<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5> ThreadTaskImpl; |
- static PassOwnPtr<CCThreadTaskImpl> create(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3, P4 parameter4, P5 parameter5) |
+ static PassOwnPtr<ThreadTaskImpl> 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)); |
+ return adoptPtr(new ThreadTaskImpl(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) |
+ ThreadTask5(T* instance, Method method, P1 parameter1, P2 parameter2, P3 parameter3, P4 parameter4, P5 parameter5) |
+ : Thread::Task(instance) |
, m_method(method) |
, m_parameter1(parameter1) |
, m_parameter2(parameter2) |
@@ -204,40 +204,40 @@ private: |
}; |
template<typename T> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
+PassOwnPtr<Thread::Task> createThreadTask( |
T* const callee, |
void (T::*method)()); |
template<typename T> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
+PassOwnPtr<Thread::Task> createThreadTask( |
T* const callee, |
void (T::*method)()) |
{ |
- return CCThreadTask0<T>::create( |
+ return ThreadTask0<T>::create( |
callee, |
method); |
} |
template<typename T, typename P1, typename MP1> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
+PassOwnPtr<Thread::Task> createThreadTask( |
T* const callee, |
void (T::*method)(MP1), |
const P1& parameter1) |
{ |
- return CCThreadTask1<T, P1, MP1>::create( |
+ return ThreadTask1<T, P1, MP1>::create( |
callee, |
method, |
parameter1); |
} |
template<typename T, typename P1, typename MP1, typename P2, typename MP2> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
+PassOwnPtr<Thread::Task> createThreadTask( |
T* const callee, |
void (T::*method)(MP1, MP2), |
const P1& parameter1, |
const P2& parameter2) |
{ |
- return CCThreadTask2<T, P1, MP1, P2, MP2>::create( |
+ return ThreadTask2<T, P1, MP1, P2, MP2>::create( |
callee, |
method, |
parameter1, |
@@ -245,14 +245,14 @@ PassOwnPtr<CCThread::Task> createCCThreadTask( |
} |
template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
+PassOwnPtr<Thread::Task> createThreadTask( |
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( |
+ return ThreadTask3<T, P1, MP1, P2, MP2, P3, MP3>::create( |
callee, |
method, |
parameter1, |
@@ -261,7 +261,7 @@ PassOwnPtr<CCThread::Task> createCCThreadTask( |
} |
template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4> |
-PassOwnPtr<CCThread::Task> createCCThreadTask( |
+PassOwnPtr<Thread::Task> createThreadTask( |
T* const callee, |
void (T::*method)(MP1, MP2, MP3, MP4), |
const P1& parameter1, |
@@ -269,7 +269,7 @@ PassOwnPtr<CCThread::Task> createCCThreadTask( |
const P3& parameter3, |
const P4& parameter4) |
{ |
- return CCThreadTask4<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4>::create( |
+ return ThreadTask4<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4>::create( |
callee, |
method, |
parameter1, |
@@ -280,7 +280,7 @@ PassOwnPtr<CCThread::Task> createCCThreadTask( |
} |
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( |
+PassOwnPtr<Thread::Task> createThreadTask( |
T* const callee, |
void (T::*method)(MP1, MP2, MP3, MP4, MP5), |
const P1& parameter1, |
@@ -289,7 +289,7 @@ PassOwnPtr<CCThread::Task> createCCThreadTask( |
const P4& parameter4, |
const P5& parameter5) |
{ |
- return CCThreadTask5<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5>::create( |
+ return ThreadTask5<T, P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5>::create( |
callee, |
method, |
parameter1, |