cc: Switch to Chromium DCHECKs and LOGs

cc/layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCLayerImpl.h"
 
 #include "base/stringprintf.h"
 #include "CCDebugBorderDrawQuad.h"
 #include "CCLayerSorter.h"
 #include "CCMathUtil.h"
 #include "CCProxy.h"
 #include "CCQuadSink.h"
 #include "CCScrollbarAnimationController.h"
 #include "CCSettings.h"
 #include "TraceEvent.h"
+#include "cc/dcheck.h"
 
 using WebKit::WebTransformationMatrix;
 
 namespace cc {
 
 CCLayerImpl::CCLayerImpl(int id)
     : m_parent(0)
     , m_maskLayerId(-1)
     , m_replicaLayerId(-1)
     , m_layerId(id)
@@ skipping 19 matching lines @@
     , m_isContainerForFixedPositionLayers(false)
     , m_fixedToContainerLayer(false)
     , m_renderTarget(0)
     , m_drawDepth(0)
     , m_drawOpacity(0)
     , m_drawOpacityIsAnimating(false)
     , m_debugBorderColor(0)
     , m_debugBorderWidth(0)
     , m_drawTransformIsAnimating(false)
     , m_screenSpaceTransformIsAnimating(false)
-#ifndef NDEBUG
+#if CC_DCHECK_ENABLED()

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

Keep this as #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

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

Keep this #ifndef NDEBUG?

-    ASSERT(!m_betweenWillDrawAndDidDraw);
-#endif
+    DCHECK(CCProxy::isImplThread());
+    DCHECK(!m_betweenWillDrawAndDidDraw);
 }
 
 void CCLayerImpl::addChild(scoped_ptr<CCLayerImpl> child)
 {
     child->setParent(this);
     m_children.append(child.Pass());
 }
 
 void CCLayerImpl::removeFromParent()
 {
@@ skipping 17 matching lines @@
         m_children[0]->removeFromParent();
 }
 
 void CCLayerImpl::clearChildList()
 {
     m_children.clear();
 }
 
 void CCLayerImpl::createRenderSurface()
 {
-    ASSERT(!m_renderSurface);
+    DCHECK(!m_renderSurface);
     m_renderSurface = make_scoped_ptr(new CCRenderSurface(this));
     setRenderTarget(this);
 }
 
 bool CCLayerImpl::descendantDrawsContent()
 {
     for (size_t i = 0; i < m_children.size(); ++i) {
         if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsContent())
             return true;
     }
     return false;
 }
 
 scoped_ptr<CCSharedQuadState> CCLayerImpl::createSharedQuadState() const
 {
     return CCSharedQuadState::create(m_drawTransform, m_visibleContentRect, m_drawableContentRect, m_drawOpacity, m_contentsOpaque);
 }
 
 void CCLayerImpl::willDraw(CCResourceProvider*)
 {
-#ifndef NDEBUG
+#if CC_DCHECK_ENABLED()

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

Keep this as #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);
+#if CC_DCHECK_ENABLED()

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

Keep this as #ifndef NDEBUG?

+    DCHECK(m_betweenWillDrawAndDidDraw);
     m_betweenWillDrawAndDidDraw = false;
 #endif
 }
 
 void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuadState* sharedQuadState, CCAppendQuadsData& appendQuadsData) const
 {
     if (!hasDebugBorders())
         return;
 
     IntRect contentRect(IntPoint(), contentBounds());
@@ skipping 10 matching lines @@
     return CCRenderPass::Id(0, 0);
 }
 
 CCRenderPass::Id CCLayerImpl::nextContributingRenderPassId(CCRenderPass::Id) const
 {
     return CCRenderPass::Id(0, 0);
 }
 
 CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const
 {
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
     return 0;
 }
 
 FloatSize CCLayerImpl::scrollBy(const FloatSize& scroll)
 {
     IntSize minDelta = -toSize(m_scrollPosition);
     IntSize maxDelta = m_maxScrollPosition - toSize(m_scrollPosition);
     // Clamp newDelta so that position + delta stays within scroll bounds.
     FloatSize newDelta = (m_scrollDelta + scroll).expandedTo(minDelta).shrunkTo(maxDelta);
     FloatSize unscrolled = m_scrollDelta + scroll - newDelta;
@@ skipping 489 matching lines @@
 
 void CCLayerImpl::setVerticalScrollbarLayer(CCScrollbarLayerImpl* scrollbarLayer)
 {
     if (!m_scrollbarAnimationController)
         m_scrollbarAnimationController = CCScrollbarAnimationController::create(this);
     m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
     m_scrollbarAnimationController->updateScrollOffset(this);
 }
 
 }