cc: Switch to Chromium DCHECKs and LOGs

cc/CCLayerImpl.cpp

Index: cc/CCLayerImpl.cpp
diff --git a/cc/CCLayerImpl.cpp b/cc/CCLayerImpl.cpp
index e0dc50953f645238aa43bb22544d8e9164bcb28b..bfffe7f6f6ceb36ba439b5eaeb13c8701e7e3edd 100644
--- a/cc/CCLayerImpl.cpp
+++ b/cc/CCLayerImpl.cpp
@@ -17,6 +17,7 @@
 #include "CCScrollbarAnimationController.h"
 #include "CCSettings.h"
 #include "TraceEvent.h"
+#include "base/logging.h"
 
 using WebKit::WebTransformationMatrix;
 
@@ -56,21 +57,17 @@ CCLayerImpl::CCLayerImpl(int id)
     , m_debugBorderWidth(0)
     , m_drawTransformIsAnimating(false)
     , m_screenSpaceTransformIsAnimating(false)
-#ifndef NDEBUG
     , m_betweenWillDrawAndDidDraw(false)
-#endif
     , m_layerAnimationController(CCLayerAnimationController::create(this))
 {
-    ASSERT(CCProxy::isImplThread());
-    ASSERT(m_layerId > 0);
+    DCHECK(CCProxy::isImplThread());
+    DCHECK(m_layerId > 0);
 }
 
 CCLayerImpl::~CCLayerImpl()
 {
-    ASSERT(CCProxy::isImplThread());
-#ifndef NDEBUG
-    ASSERT(!m_betweenWillDrawAndDidDraw);
-#endif
+    DCHECK(CCProxy::isImplThread());
+    DCHECK(!m_betweenWillDrawAndDidDraw);
 }
 
 void CCLayerImpl::addChild(PassOwnPtr<CCLayerImpl> child)
@@ -108,7 +105,7 @@ void CCLayerImpl::clearChildList()
 
 void CCLayerImpl::createRenderSurface()
 {
-    ASSERT(!m_renderSurface);
+    DCHECK(!m_renderSurface);
     m_renderSurface = adoptPtr(new CCRenderSurface(this));
     setRenderTarget(this);
 }
@@ -129,19 +126,15 @@ scoped_ptr<CCSharedQuadState> CCLayerImpl::createSharedQuadState() const
 
 void CCLayerImpl::willDraw(CCResourceProvider*)
 {
-#ifndef NDEBUG
     // willDraw/didDraw must be matched.
-    ASSERT(!m_betweenWillDrawAndDidDraw);
+    DCHECK(!m_betweenWillDrawAndDidDraw);
     m_betweenWillDrawAndDidDraw = true;
-#endif
 }
 
 void CCLayerImpl::didDraw(CCResourceProvider*)
 {
-#ifndef NDEBUG
-    ASSERT(m_betweenWillDrawAndDidDraw);
+    DCHECK(m_betweenWillDrawAndDidDraw);
     m_betweenWillDrawAndDidDraw = false;
-#endif
 }
 
 void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuadState* sharedQuadState, CCAppendQuadsData& appendQuadsData) const
@@ -170,7 +163,7 @@ CCRenderPass::Id CCLayerImpl::nextContributingRenderPassId(CCRenderPass::Id) con
 
 CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const
 {
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
     return 0;
 }