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/draw_quad.cc | |
| 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/draw_quad.cc')
| -rw-r--r-- | cc/draw_quad.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cc/draw_quad.cc b/cc/draw_quad.cc index b88eac6..999b0aa 100644 --- a/cc/draw_quad.cc +++ b/cc/draw_quad.cc @@ -5,6 +5,7 @@ #include "config.h" #include "CCDrawQuad.h" +#include "base/logging.h" #include "CCCheckerboardDrawQuad.h" #include "CCDebugBorderDrawQuad.h" #include "CCIOSurfaceDrawQuad.h" @@ -27,8 +28,8 @@ CCDrawQuad::CCDrawQuad(const CCSharedQuadState* sharedQuadState, Material materi , m_quadOpaque(true) , m_needsBlending(false) { - ASSERT(m_sharedQuadState); - ASSERT(m_material != Invalid); + DCHECK(m_sharedQuadState); + DCHECK(m_material != Invalid); } IntRect CCDrawQuad::opaqueRect() const @@ -79,10 +80,10 @@ unsigned CCDrawQuad::size() const scoped_ptr<CCDrawQuad> CCDrawQuad::copy(const CCSharedQuadState* copiedSharedQuadState) const { // RenderPass quads have their own copy() method. - ASSERT(material() != RenderPass); + DCHECK(material() != RenderPass); unsigned bytes = size(); - ASSERT(bytes); + DCHECK(bytes > 0); scoped_ptr<CCDrawQuad> copyQuad(reinterpret_cast<CCDrawQuad*>(new char[bytes])); memcpy(copyQuad.get(), this, bytes); |