cc: Switch to Chromium DCHECKs and LOGs

cc/CCSingleThreadProxy.cpp

Index: cc/CCSingleThreadProxy.cpp
diff --git a/cc/CCSingleThreadProxy.cpp b/cc/CCSingleThreadProxy.cpp
index 7f89cf5a75827741f568cb6ba1f4ffe7bd7b82b6..e5234d6163b859fc2c5b4abf05d7d6bb6e4d20d4 100644
--- a/cc/CCSingleThreadProxy.cpp
+++ b/cc/CCSingleThreadProxy.cpp
@@ -31,7 +31,7 @@ CCSingleThreadProxy::CCSingleThreadProxy(CCLayerTreeHost* layerTreeHost)
     , m_totalCommitCount(0)
 {
     TRACE_EVENT0("cc", "CCSingleThreadProxy::CCSingleThreadProxy");
-    ASSERT(CCProxy::isMainThread());
+    DCHECK(CCProxy::isMainThread());
 }
 
 void CCSingleThreadProxy::start()
@@ -43,14 +43,14 @@ void CCSingleThreadProxy::start()
 CCSingleThreadProxy::~CCSingleThreadProxy()
 {
     TRACE_EVENT0("cc", "CCSingleThreadProxy::~CCSingleThreadProxy");
-    ASSERT(CCProxy::isMainThread());
-    ASSERT(!m_layerTreeHostImpl.get() && !m_layerTreeHost); // make sure stop() got called.
+    DCHECK(CCProxy::isMainThread());
+    DCHECK(!m_layerTreeHostImpl.get() && !m_layerTreeHost); // make sure stop() got called.
 }
 
 bool CCSingleThreadProxy::compositeAndReadback(void *pixels, const IntRect& rect)
 {
     TRACE_EVENT0("cc", "CCSingleThreadProxy::compositeAndReadback");
-    ASSERT(CCProxy::isMainThread());
+    DCHECK(CCProxy::isMainThread());
 
     if (!commitAndComposite())
         return false;
@@ -73,7 +73,7 @@ void CCSingleThreadProxy::startPageScaleAnimation(const IntSize& targetPosition,
 
 void CCSingleThreadProxy::finishAllRendering()
 {
-    ASSERT(CCProxy::isMainThread());
+    DCHECK(CCProxy::isMainThread());
     {
         DebugScopedSetImplThread impl;
         m_layerTreeHostImpl->finishAllRendering();
@@ -82,13 +82,13 @@ void CCSingleThreadProxy::finishAllRendering()
 
 bool CCSingleThreadProxy::isStarted() const
 {
-    ASSERT(CCProxy::isMainThread());
+    DCHECK(CCProxy::isMainThread());
     return m_layerTreeHostImpl.get();
 }
 
 bool CCSingleThreadProxy::initializeContext()
 {
-    ASSERT(CCProxy::isMainThread());
+    DCHECK(CCProxy::isMainThread());
     scoped_ptr<CCGraphicsContext> context = m_layerTreeHost->createContext();
     if (!context.get())
         return false;
@@ -109,8 +109,8 @@ void CCSingleThreadProxy::setVisible(bool visible)
 
 bool CCSingleThreadProxy::initializeRenderer()
 {
-    ASSERT(CCProxy::isMainThread());
-    ASSERT(m_contextBeforeInitialization.get());
+    DCHECK(CCProxy::isMainThread());
+    DCHECK(m_contextBeforeInitialization.get());
     {
         DebugScopedSetImplThread impl;
         bool ok = m_layerTreeHostImpl->initializeRenderer(m_contextBeforeInitialization.Pass());
@@ -126,8 +126,8 @@ bool CCSingleThreadProxy::initializeRenderer()
 bool CCSingleThreadProxy::recreateContext()
 {
     TRACE_EVENT0("cc", "CCSingleThreadProxy::recreateContext");
-    ASSERT(CCProxy::isMainThread());
-    ASSERT(m_contextLost);
+    DCHECK(CCProxy::isMainThread());
+    DCHECK(m_contextLost);
 
     scoped_ptr<CCGraphicsContext> context = m_layerTreeHost->createContext();
     if (!context.get())
@@ -160,14 +160,14 @@ void CCSingleThreadProxy::renderingStats(CCRenderingStats* stats)
 
 const RendererCapabilities& CCSingleThreadProxy::rendererCapabilities() const
 {
-    ASSERT(m_rendererInitialized);
+    DCHECK(m_rendererInitialized);
     // Note: this gets called during the commit by the "impl" thread
     return m_RendererCapabilitiesForMainThread;
 }
 
 void CCSingleThreadProxy::loseContext()
 {
-    ASSERT(CCProxy::isMainThread());
+    DCHECK(CCProxy::isMainThread());
     m_layerTreeHost->didLoseContext();
     m_contextLost = true;
 }
@@ -175,12 +175,12 @@ void CCSingleThreadProxy::loseContext()
 void CCSingleThreadProxy::setNeedsAnimate()
 {
     // CCThread-only feature
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
 }
 
 void CCSingleThreadProxy::doCommit(PassOwnPtr<CCTextureUpdateQueue> queue)
 {
-    ASSERT(CCProxy::isMainThread());
+    DCHECK(CCProxy::isMainThread());
     // Commit immediately
     {
         DebugScopedSetMainThreadBlocked mainThreadBlocked;
@@ -204,12 +204,12 @@ void CCSingleThreadProxy::doCommit(PassOwnPtr<CCTextureUpdateQueue> queue)
 
         m_layerTreeHostImpl->commitComplete();
 
-#if !ASSERT_DISABLED
-        // In the single-threaded case, the scroll deltas should never be
-        // touched on the impl layer tree.
-        scoped_ptr<CCScrollAndScaleSet> scrollInfo = m_layerTreeHostImpl->processScrollDeltas();
-        ASSERT(!scrollInfo->scrolls.size());
-#endif
+        if (DCHECK_IS_ON()) {
+            // In the single-threaded case, the scroll deltas should never be
+            // touched on the impl layer tree.
+            scoped_ptr<CCScrollAndScaleSet> scrollInfo = m_layerTreeHostImpl->processScrollDeltas();
+            DCHECK(!scrollInfo->scrolls.size());
+        }
 
         base::TimeTicks endTime = base::TimeTicks::HighResNow();
         m_totalCommitTime += endTime - startTime;
@@ -221,7 +221,7 @@ void CCSingleThreadProxy::doCommit(PassOwnPtr<CCTextureUpdateQueue> queue)
 
 void CCSingleThreadProxy::setNeedsCommit()
 {
-    ASSERT(CCProxy::isMainThread());
+    DCHECK(CCProxy::isMainThread());
     m_layerTreeHost->scheduleComposite();
 }
 
@@ -250,7 +250,7 @@ size_t CCSingleThreadProxy::maxPartialTextureUpdates() const
 void CCSingleThreadProxy::stop()
 {
     TRACE_EVENT0("cc", "CCSingleThreadProxy::stop");
-    ASSERT(CCProxy::isMainThread());
+    DCHECK(CCProxy::isMainThread());
     {
         DebugScopedSetMainThreadBlocked mainThreadBlocked;
         DebugScopedSetImplThread impl;
@@ -274,14 +274,14 @@ void CCSingleThreadProxy::setNeedsCommitOnImplThread()
 
 void CCSingleThreadProxy::postAnimationEventsToMainThreadOnImplThread(scoped_ptr<CCAnimationEventsVector> events, double wallClockTime)
 {
-    ASSERT(CCProxy::isImplThread());
+    DCHECK(CCProxy::isImplThread());
     DebugScopedSetMainThread main;
     m_layerTreeHost->setAnimationEvents(events.Pass(), wallClockTime);
 }
 
 void CCSingleThreadProxy::releaseContentsTexturesOnImplThread()
 {
-    ASSERT(isImplThread());
+    DCHECK(isImplThread());
     m_layerTreeHost->reduceContentsTexturesMemoryOnImplThread(0, m_layerTreeHostImpl->resourceProvider());
 }
 
@@ -305,12 +305,12 @@ void CCSingleThreadProxy::forceSerializeOnSwapBuffers()
 
 void CCSingleThreadProxy::onSwapBuffersCompleteOnImplThread()
 {
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
 }
 
 bool CCSingleThreadProxy::commitAndComposite()
 {
-    ASSERT(CCProxy::isMainThread());
+    DCHECK(CCProxy::isMainThread());
 
     if (!m_layerTreeHost->initializeRendererIfNeeded())
         return false;
@@ -342,7 +342,7 @@ bool CCSingleThreadProxy::commitAndComposite()
 
 bool CCSingleThreadProxy::doComposite()
 {
-    ASSERT(!m_contextLost);
+    DCHECK(!m_contextLost);
     {
         DebugScopedSetImplThread impl;