cc: Switch to Chromium DCHECKs and LOGs

cc/layer_impl.h

Index: cc/layer_impl.h
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index 01ab13a63cb6536b72fa16948ba1a852f49acc86..b2b598862cdfdd4f4aff932ecf3d889ecb1dfaff 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -6,6 +6,7 @@
 #define CCLayerImpl_h
 
 #include "base/memory/scoped_ptr.h"
+#include "cc/dcheck.h"
 #include "cc/scoped_ptr_vector.h"
 #include "CCInputHandler.h"
 #include "CCLayerAnimationController.h"
@@ -160,7 +161,7 @@ public:
     bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; }
     void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; }
 
-    CCLayerImpl* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; }
+    CCLayerImpl* renderTarget() const { DCHECK(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; }
     void setRenderTarget(CCLayerImpl* target) { m_renderTarget = target; }
 
     void setBounds(const IntSize&);
@@ -367,7 +368,7 @@ private:
     bool m_drawTransformIsAnimating;
     bool m_screenSpaceTransformIsAnimating;
 
-#ifndef NDEBUG
+#if CC_DCHECK_ENABLED()

[slavi, 2012/10/16 20:31:46]

Keep this as #ifndef NDEBUG?

     bool m_betweenWillDrawAndDidDraw;
 #endif