Index: cc/proxy.cc |
diff --git a/cc/proxy.cc b/cc/proxy.cc |
index c3c6a11ef2eb00bc76953d2c1253e4ba68c2814a..4f40144f25a7f08e19d280d902893b9ed2ed5749 100644 |
--- a/cc/proxy.cc |
+++ b/cc/proxy.cc |
@@ -16,36 +16,36 @@ bool implThreadIsOverridden = false; |
bool s_isMainThreadBlocked = false; |
base::PlatformThreadId threadIDOverridenToBeImplThread; |
#endif |
-CCThread* s_mainThread = 0; |
-CCThread* s_implThread = 0; |
+Thread* s_mainThread = 0; |
+Thread* s_implThread = 0; |
} |
-void CCProxy::setMainThread(CCThread* thread) |
+void Proxy::setMainThread(Thread* thread) |
{ |
s_mainThread = thread; |
} |
-CCThread* CCProxy::mainThread() |
+Thread* Proxy::mainThread() |
{ |
return s_mainThread; |
} |
-bool CCProxy::hasImplThread() |
+bool Proxy::hasImplThread() |
{ |
return s_implThread; |
} |
-void CCProxy::setImplThread(CCThread* thread) |
+void Proxy::setImplThread(Thread* thread) |
{ |
s_implThread = thread; |
} |
-CCThread* CCProxy::implThread() |
+Thread* Proxy::implThread() |
{ |
return s_implThread; |
} |
-CCThread* CCProxy::currentThread() |
+Thread* Proxy::currentThread() |
{ |
base::PlatformThreadId currentThreadIdentifier = base::PlatformThread::CurrentId(); |
if (s_mainThread && s_mainThread->threadID() == currentThreadIdentifier) |
@@ -56,7 +56,7 @@ CCThread* CCProxy::currentThread() |
} |
#ifndef NDEBUG |
-bool CCProxy::isMainThread() |
+bool Proxy::isMainThread() |
{ |
ASSERT(s_mainThread); |
if (implThreadIsOverridden && base::PlatformThread::CurrentId() == threadIDOverridenToBeImplThread) |
@@ -64,7 +64,7 @@ bool CCProxy::isMainThread() |
return base::PlatformThread::CurrentId() == s_mainThread->threadID(); |
} |
-bool CCProxy::isImplThread() |
+bool Proxy::isImplThread() |
{ |
base::PlatformThreadId implThreadID = s_implThread ? s_implThread->threadID() : 0; |
if (implThreadIsOverridden && base::PlatformThread::CurrentId() == threadIDOverridenToBeImplThread) |
@@ -72,30 +72,30 @@ bool CCProxy::isImplThread() |
return base::PlatformThread::CurrentId() == implThreadID; |
} |
-void CCProxy::setCurrentThreadIsImplThread(bool isImplThread) |
+void Proxy::setCurrentThreadIsImplThread(bool isImplThread) |
{ |
implThreadIsOverridden = isImplThread; |
if (isImplThread) |
threadIDOverridenToBeImplThread = base::PlatformThread::CurrentId(); |
} |
-bool CCProxy::isMainThreadBlocked() |
+bool Proxy::isMainThreadBlocked() |
{ |
return s_isMainThreadBlocked; |
} |
-void CCProxy::setMainThreadBlocked(bool isMainThreadBlocked) |
+void Proxy::setMainThreadBlocked(bool isMainThreadBlocked) |
{ |
s_isMainThreadBlocked = isMainThreadBlocked; |
} |
#endif |
-CCProxy::CCProxy() |
+Proxy::Proxy() |
{ |
ASSERT(isMainThread()); |
} |
-CCProxy::~CCProxy() |
+Proxy::~Proxy() |
{ |
ASSERT(isMainThread()); |
} |