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/software_renderer.cc | |
| 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/software_renderer.cc')
| -rw-r--r-- | cc/software_renderer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc index 0aeb33b..b441f8d 100644 --- a/cc/software_renderer.cc +++ b/cc/software_renderer.cc @@ -264,7 +264,7 @@ void CCRendererSoftware::drawTextureQuad(const DrawingFrame& frame, const CCText void CCRendererSoftware::drawTileQuad(const DrawingFrame& frame, const CCTileDrawQuad* quad) { - ASSERT(isSoftwareResource(quad->resourceId())); + DCHECK(isSoftwareResource(quad->resourceId())); CCResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider, quad->resourceId()); SkIRect uvRect = toSkIRect(IntRect(quad->textureOffset(), quad->quadRect().size())); @@ -277,7 +277,7 @@ void CCRendererSoftware::drawRenderPassQuad(const DrawingFrame& frame, const CCR if (!contentsTexture || !contentsTexture->id()) return; - ASSERT(isSoftwareResource(contentsTexture->id())); + DCHECK(isSoftwareResource(contentsTexture->id())); CCResourceProvider::ScopedReadLockSoftware contentsTextureLock(m_resourceProvider, contentsTexture->id()); const SkBitmap* bitmap = contentsTextureLock.skBitmap(); |