diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 00:50:19 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 00:50:19 +0000 |
| commit | bc3847a1ba39db7adec20aa9e0565f6e868e8480 (patch) | |
| tree | 572eb2450ffd1bcee7f1932974f04de80c179e90 /cc/layer_impl.h | |
| parent | eff7a36630d6c8f86921dff9128c8be47d7c5021 (diff) | |
| download | chromium_src-bc3847a1ba39db7adec20aa9e0565f6e868e8480.zip chromium_src-bc3847a1ba39db7adec20aa9e0565f6e868e8480.tar.gz chromium_src-bc3847a1ba39db7adec20aa9e0565f6e868e8480.tar.bz2 | |
cc: Switch to Chromium DCHECKs LOGs
We can't compile-guard code and use DCHECK since it can be enabled at runtime.
This removes all compile-time guards, and makes use of DCHECK instead of ASSERT. We use DCHECK_IS_ON() to early out and avoid extra work just for DCHECK where possible as well.
This also replaces use of LOG_ERROR("Foo") with LOG(ERROR)<<"Foo";
R=enne,jamesr
Review URL: https://chromiumcodereview.appspot.com/11048044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_impl.h')
| -rw-r--r-- | cc/layer_impl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/layer_impl.h b/cc/layer_impl.h index 01ab13a..b2b5988 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() bool m_betweenWillDrawAndDidDraw; #endif |