cc: Switch to Chromium DCHECKs and LOGs

cc/CCRenderSurface.cpp

Index: cc/CCRenderSurface.cpp
diff --git a/cc/CCRenderSurface.cpp b/cc/CCRenderSurface.cpp
index f10c83bf7e743e7a73d8952fdd542831c1c181f0..96587f1849dce7129e2049ea57c29029eec02193 100644
--- a/cc/CCRenderSurface.cpp
+++ b/cc/CCRenderSurface.cpp
@@ -8,6 +8,7 @@
 
 #include "CCRenderSurface.h"
 
+#include "base/logging.h"
 #include "base/stringprintf.h"
 #include "CCDamageTracker.h"
 #include "CCDebugBorderDrawQuad.h"
@@ -136,7 +137,7 @@ bool CCRenderSurface::surfacePropertyChanged() const
     // - all other property changes come from the owning layer (or some ancestor layer
     //   that propagates its change to the owning layer).
     //
-    ASSERT(m_owningLayer);
+    DCHECK(m_owningLayer);
     return m_surfacePropertyChanged || m_owningLayer->layerPropertyChanged();
 }
 
@@ -147,7 +148,7 @@ bool CCRenderSurface::surfacePropertyChangedOnlyFromDescendant() const
 
 void CCRenderSurface::addContributingDelegatedRenderPassLayer(CCLayerImpl* layer)
 {
-    ASSERT(std::find(m_layerList.begin(), m_layerList.end(), layer) != m_layerList.end());
+    DCHECK(std::find(m_layerList.begin(), m_layerList.end(), layer) != m_layerList.end());
     CCDelegatedRendererLayerImpl* delegatedRendererLayer = static_cast<CCDelegatedRendererLayerImpl*>(layer);
     m_contributingDelegatedRenderPassLayerList.push_back(delegatedRendererLayer);
 }
@@ -160,7 +161,7 @@ void CCRenderSurface::clearLayerLists()
 
 static inline IntRect computeClippedRectInTarget(const CCLayerImpl* owningLayer)
 {
-    ASSERT(owningLayer->parent());
+    DCHECK(owningLayer->parent());
 
     const CCLayerImpl* renderTarget = owningLayer->parent()->renderTarget();
     const CCRenderSurface* self = owningLayer->renderSurface();
@@ -182,7 +183,7 @@ CCRenderPass::Id CCRenderSurface::renderPassId()
 {
     int layerId = m_owningLayer->id();
     int subId = 0;
-    ASSERT(layerId > 0);
+    DCHECK(layerId > 0);
     return CCRenderPass::Id(layerId, subId);
 }
 
@@ -200,7 +201,7 @@ void CCRenderSurface::appendRenderPasses(CCRenderPassSink& passSink)
 
 void CCRenderSurface::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData, bool forReplica, CCRenderPass::Id renderPassId)
 {
-    ASSERT(!forReplica || m_owningLayer->hasReplica());
+    DCHECK(!forReplica || m_owningLayer->hasReplica());
 
     IntRect clippedRectInTarget = computeClippedRectInTarget(m_owningLayer);
     bool isOpaque = false;