Remove WebKit::Platform dependencies from cc

cc/proxy.cc

 // Copyright 2011 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.
 
 #include "config.h"
 
 #include "cc/proxy.h"
 
-#include "cc/thread_task.h"
+#include "cc/thread.h"
 
 namespace cc {
 
 namespace {
 #ifndef NDEBUG
 bool implThreadIsOverridden = false;
 bool s_isMainThreadBlocked = false;
-base::PlatformThreadId threadIDOverridenToBeImplThread;
 #endif
 Thread* s_mainThread = 0;
 Thread* s_implThread = 0;
 }
 
 void Proxy::setMainThread(Thread* thread)
 {
     s_mainThread = thread;
 }
 
@@ skipping 12 matching lines @@
     s_implThread = thread;
 }
 
 Thread* Proxy::implThread()
 {
     return s_implThread;
 }
 
 Thread* Proxy::currentThread()
 {
-    base::PlatformThreadId currentThreadIdentifier = base::PlatformThread::CurrentId();
-    if (s_mainThread && s_mainThread->threadID() == currentThreadIdentifier)
+    if (s_mainThread && s_mainThread->belongsToCurrentThread())
         return s_mainThread;
-    if (s_implThread && s_implThread->threadID() == currentThreadIdentifier)
+    if (s_implThread && s_implThread->belongsToCurrentThread())
         return s_implThread;
     return 0;
 }
 
 bool Proxy::isMainThread()
 {
 #ifndef NDEBUG
     DCHECK(s_mainThread);
-    if (implThreadIsOverridden && base::PlatformThread::CurrentId() == threadIDOverridenToBeImplThread)
+    if (implThreadIsOverridden)
         return false;
-    return base::PlatformThread::CurrentId() == s_mainThread->threadID();
+    return s_mainThread->belongsToCurrentThread();
 #else
     return true;
 #endif
 }
 
 bool Proxy::isImplThread()
 {
 #ifndef NDEBUG
-    base::PlatformThreadId implThreadID = s_implThread ? s_implThread->threadID() : 0;
-    if (implThreadIsOverridden && base::PlatformThread::CurrentId() == threadIDOverridenToBeImplThread)
+    if (implThreadIsOverridden)
         return true;
-    return base::PlatformThread::CurrentId() == implThreadID;
+    return s_implThread && s_implThread->belongsToCurrentThread();
 #else
     return true;
 #endif
 }
 
 #ifndef NDEBUG
 void Proxy::setCurrentThreadIsImplThread(bool isImplThread)
 {
     implThreadIsOverridden = isImplThread;
-    if (isImplThread)
-        threadIDOverridenToBeImplThread = base::PlatformThread::CurrentId();
 }
 #endif
 
 bool Proxy::isMainThreadBlocked()
 {
 #ifndef NDEBUG
     return s_isMainThreadBlocked;
 #else
     return true;
 #endif
@@ skipping 10 matching lines @@
 {
     DCHECK(isMainThread());
 }
 
 Proxy::~Proxy()
 {
     DCHECK(isMainThread());
 }
 
 }