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.h | |
| 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.h')
| -rw-r--r-- | cc/layer_impl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/layer_impl.h b/cc/layer_impl.h index b2b5988..01ab13a 100644 --- a/cc/layer_impl.h +++ b/cc/layer_impl.h @@ -6,7 +6,6 @@ #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" @@ -161,7 +160,7 @@ public: bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; } void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; } - CCLayerImpl* renderTarget() const { DCHECK(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; } + CCLayerImpl* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; } void setRenderTarget(CCLayerImpl* target) { m_renderTarget = target; } void setBounds(const IntSize&); @@ -368,7 +367,7 @@ private: bool m_drawTransformIsAnimating; bool m_screenSpaceTransformIsAnimating; -#if CC_DCHECK_ENABLED() +#ifndef NDEBUG bool m_betweenWillDrawAndDidDraw; #endif |