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/heads_up_display_layer_impl.cc | |
| 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/heads_up_display_layer_impl.cc')
| -rw-r--r-- | cc/heads_up_display_layer_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc index c6a46b8..4b64b1a 100644 --- a/cc/heads_up_display_layer_impl.cc +++ b/cc/heads_up_display_layer_impl.cc @@ -105,7 +105,7 @@ void CCHeadsUpDisplayLayerImpl::updateHudTexture(CCResourceProvider* resourcePro SkAutoLockPixels locker(*bitmap); IntRect layerRect(IntPoint(), bounds()); - DCHECK(bitmap->config() == SkBitmap::kARGB_8888_Config); + ASSERT(bitmap->config() == SkBitmap::kARGB_8888_Config); resourceProvider->upload(m_hudTexture->id(), static_cast<const uint8_t*>(bitmap->getPixels()), layerRect, layerRect, IntSize()); } @@ -119,7 +119,7 @@ void CCHeadsUpDisplayLayerImpl::didDraw(CCResourceProvider* resourceProvider) // FIXME: the following assert will not be true when sending resources to a // parent compositor. We will probably need to hold on to m_hudTexture for // longer, and have several HUD textures in the pipeline. - DCHECK(!resourceProvider->inUseByConsumer(m_hudTexture->id())); + ASSERT(!resourceProvider->inUseByConsumer(m_hudTexture->id())); } void CCHeadsUpDisplayLayerImpl::didLoseContext() |