cc: Switch to Chromium DCHECKs LOGs

We can't compile-guard code and use DCHECK since it can be enabled at runtime. So we guard the DCHECKs that we want to rely on conditionally-compiled code in !NDEBUG compile guards.

This also replaces use of LOG_ERROR("Foo") with LOG(ERROR)<<"Foo";

This was previously discussed and committed as https://codereview.chromium.org/11048044/
using a guard based on LOGGING_IS_OFFICIAL_BUILD, however this was not sufficient since there are build configurations that are official builds but have dchecks compiled.

R=enne

Review URL: https://codereview.chromium.org/11192030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162739 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index fcab26e..d58ab74 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -59,15 +59,15 @@ CCLayerImpl::CCLayerImpl(int id)
 #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());
+    DCHECK(CCProxy::isImplThread());
 #ifndef NDEBUG
-    ASSERT(!m_betweenWillDrawAndDidDraw);
+    DCHECK(!m_betweenWillDrawAndDidDraw);
 #endif
 }
 
@@ -106,7 +106,7 @@ void CCLayerImpl::clearChildList()
 
 void CCLayerImpl::createRenderSurface()
 {
-    ASSERT(!m_renderSurface);
+    DCHECK(!m_renderSurface);
     m_renderSurface = make_scoped_ptr(new CCRenderSurface(this));
     setRenderTarget(this);
 }
@@ -129,7 +129,7 @@ void CCLayerImpl::willDraw(CCResourceProvider*)
 {
 #ifndef NDEBUG
     // willDraw/didDraw must be matched.
-    ASSERT(!m_betweenWillDrawAndDidDraw);
+    DCHECK(!m_betweenWillDrawAndDidDraw);
     m_betweenWillDrawAndDidDraw = true;
 #endif
 }
@@ -137,7 +137,7 @@ void CCLayerImpl::willDraw(CCResourceProvider*)
 void CCLayerImpl::didDraw(CCResourceProvider*)
 {
 #ifndef NDEBUG
-    ASSERT(m_betweenWillDrawAndDidDraw);
+    DCHECK(m_betweenWillDrawAndDidDraw);
     m_betweenWillDrawAndDidDraw = false;
 #endif
 }
@@ -168,7 +168,7 @@ CCRenderPass::Id CCLayerImpl::nextContributingRenderPassId(CCRenderPass::Id) con
 
 CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const
 {
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
     return 0;
 }