cc: Switch to Chromium DCHECKs and LOGs

cc/CCProxy.cpp

 // 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 "CCProxy.h"
 
 #include "CCThreadTask.h"
 
 using namespace WTF;
 
 namespace cc {
 
 namespace {
-#ifndef NDEBUG
 bool implThreadIsOverridden = false;
 bool s_isMainThreadBlocked = false;
 base::PlatformThreadId threadIDOverridenToBeImplThread;
-#endif
 CCThread* s_mainThread = 0;
 CCThread* s_implThread = 0;
 }
 
 void CCProxy::setMainThread(CCThread* thread)
 {
     s_mainThread = thread;
 }
 
 CCThread* CCProxy::mainThread()
@@ skipping 19 matching lines @@
 CCThread* CCProxy::currentThread()
 {
     base::PlatformThreadId currentThreadIdentifier = base::PlatformThread::CurrentId();
     if (s_mainThread && s_mainThread->threadID() == currentThreadIdentifier)
         return s_mainThread;
     if (s_implThread && s_implThread->threadID() == currentThreadIdentifier)
         return s_implThread;
     return 0;
 }
 
-#ifndef NDEBUG
 bool CCProxy::isMainThread()
 {
-    ASSERT(s_mainThread);
+    if (!DCHECK_IS_ON())
+        return true;
+
+    DCHECK(s_mainThread);
     if (implThreadIsOverridden && base::PlatformThread::CurrentId() == threadIDOverridenToBeImplThread)
         return false;
     return base::PlatformThread::CurrentId() == s_mainThread->threadID();
 }
 
 bool CCProxy::isImplThread()
 {
+    if (!DCHECK_IS_ON())
+        return true;
+
     base::PlatformThreadId implThreadID = s_implThread ? s_implThread->threadID() : 0;
     if (implThreadIsOverridden && base::PlatformThread::CurrentId() == threadIDOverridenToBeImplThread)
         return true;
     return base::PlatformThread::CurrentId() == implThreadID;
 }
 
 void CCProxy::setCurrentThreadIsImplThread(bool isImplThread)
 {
+    if (!DCHECK_IS_ON())
+        return;
+
     implThreadIsOverridden = isImplThread;
     if (isImplThread)
         threadIDOverridenToBeImplThread = base::PlatformThread::CurrentId();
 }
 
 bool CCProxy::isMainThreadBlocked()
 {
+    if (!DCHECK_IS_ON())
+        return true;
     return s_isMainThreadBlocked;
 }
 
 void CCProxy::setMainThreadBlocked(bool isMainThreadBlocked)
 {
+    if (!DCHECK_IS_ON())
+        return;
     s_isMainThreadBlocked = isMainThreadBlocked;
 }
-#endif
 
 CCProxy::CCProxy()
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
 }
 
 CCProxy::~CCProxy()
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
 }
 
 }