diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 01:25:18 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 01:25:18 +0000 |
| commit | e7f87cfba8e6f916dd88359ed9abf6ec6884d65d (patch) | |
| tree | 289b3ec335cf58e6924f5a6fccd8e17ea1c6585a /cc/layer_impl.cc | |
| parent | bc3847a1ba39db7adec20aa9e0565f6e868e8480 (diff) | |
| download | chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.zip chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.gz chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.bz2 | |
Revert "cc: Switch to Chromium DCHECKs LOGs"
This reverts commit 162296. (https://chromiumcodereview.appspot.com/11048044)
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/11196014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_impl.cc')
| -rw-r--r-- | cc/layer_impl.cc | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc index a7307a5..2b30363 100644 --- a/cc/layer_impl.cc +++ b/cc/layer_impl.cc @@ -54,19 +54,21 @@ CCLayerImpl::CCLayerImpl(int id) , m_debugBorderWidth(0) , m_drawTransformIsAnimating(false) , m_screenSpaceTransformIsAnimating(false) -#if CC_DCHECK_ENABLED() +#ifndef NDEBUG , m_betweenWillDrawAndDidDraw(false) #endif , m_layerAnimationController(CCLayerAnimationController::create(this)) { - DCHECK(CCProxy::isImplThread()); - DCHECK(m_layerId > 0); + ASSERT(CCProxy::isImplThread()); + ASSERT(m_layerId > 0); } CCLayerImpl::~CCLayerImpl() { - DCHECK(CCProxy::isImplThread()); - DCHECK(!m_betweenWillDrawAndDidDraw); + ASSERT(CCProxy::isImplThread()); +#ifndef NDEBUG + ASSERT(!m_betweenWillDrawAndDidDraw); +#endif } void CCLayerImpl::addChild(scoped_ptr<CCLayerImpl> child) @@ -104,7 +106,7 @@ void CCLayerImpl::clearChildList() void CCLayerImpl::createRenderSurface() { - DCHECK(!m_renderSurface); + ASSERT(!m_renderSurface); m_renderSurface = make_scoped_ptr(new CCRenderSurface(this)); setRenderTarget(this); } @@ -125,17 +127,17 @@ scoped_ptr<CCSharedQuadState> CCLayerImpl::createSharedQuadState() const void CCLayerImpl::willDraw(CCResourceProvider*) { -#if CC_DCHECK_ENABLED() +#ifndef NDEBUG // willDraw/didDraw must be matched. - DCHECK(!m_betweenWillDrawAndDidDraw); + ASSERT(!m_betweenWillDrawAndDidDraw); m_betweenWillDrawAndDidDraw = true; #endif } void CCLayerImpl::didDraw(CCResourceProvider*) { -#if CC_DCHECK_ENABLED() - DCHECK(m_betweenWillDrawAndDidDraw); +#ifndef NDEBUG + ASSERT(m_betweenWillDrawAndDidDraw); m_betweenWillDrawAndDidDraw = false; #endif } @@ -166,7 +168,7 @@ CCRenderPass::Id CCLayerImpl::nextContributingRenderPassId(CCRenderPass::Id) con CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const { - NOTREACHED(); + ASSERT_NOT_REACHED(); return 0; } |