diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 18:15:04 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 18:15:04 +0000 |
| commit | 1d99317a73040007668b1cdf134334f45d45600e (patch) | |
| tree | 0da28120111aa69a339ec90ff05d7cac8b21cf77 /cc/layer_impl.h | |
| parent | 52f1a7e63128f2a4f644e1a28a6744b916585999 (diff) | |
| download | chromium_src-1d99317a73040007668b1cdf134334f45d45600e.zip chromium_src-1d99317a73040007668b1cdf134334f45d45600e.tar.gz chromium_src-1d99317a73040007668b1cdf134334f45d45600e.tar.bz2 | |
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
Diffstat (limited to 'cc/layer_impl.h')
| -rw-r--r-- | cc/layer_impl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/layer_impl.h b/cc/layer_impl.h index 01ab13a..32be1cd 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 "base/logging.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&); |