Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: cc/layer_impl.cc

Issue 11192030: cc: Switch to Chromium DCHECKs LOGs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebaseonenne Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layer_impl.h ('k') | cc/layer_iterator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_impl.cc
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index fcab26e2a93ec1d52a02202a65e2b4a35a4c4552..d58ab741db2038fe2f1ede95e475c9ce98992a99 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -59,15 +59,15 @@ CCLayerImpl::CCLayerImpl(int id)
#endif
, m_layerAnimationController(CCLayerAnimationController::create(this))
{
- ASSERT(CCProxy::isImplThread());
- ASSERT(m_layerId > 0);
+ DCHECK(CCProxy::isImplThread());
+ DCHECK(m_layerId > 0);
}
CCLayerImpl::~CCLayerImpl()
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
#ifndef NDEBUG
- ASSERT(!m_betweenWillDrawAndDidDraw);
+ DCHECK(!m_betweenWillDrawAndDidDraw);
#endif
}
@@ -106,7 +106,7 @@ void CCLayerImpl::clearChildList()
void CCLayerImpl::createRenderSurface()
{
- ASSERT(!m_renderSurface);
+ DCHECK(!m_renderSurface);
m_renderSurface = make_scoped_ptr(new CCRenderSurface(this));
setRenderTarget(this);
}
@@ -129,7 +129,7 @@ void CCLayerImpl::willDraw(CCResourceProvider*)
{
#ifndef NDEBUG
// willDraw/didDraw must be matched.
- ASSERT(!m_betweenWillDrawAndDidDraw);
+ DCHECK(!m_betweenWillDrawAndDidDraw);
m_betweenWillDrawAndDidDraw = true;
#endif
}
@@ -137,7 +137,7 @@ void CCLayerImpl::willDraw(CCResourceProvider*)
void CCLayerImpl::didDraw(CCResourceProvider*)
{
#ifndef NDEBUG
- ASSERT(m_betweenWillDrawAndDidDraw);
+ DCHECK(m_betweenWillDrawAndDidDraw);
m_betweenWillDrawAndDidDraw = false;
#endif
}
@@ -168,7 +168,7 @@ CCRenderPass::Id CCLayerImpl::nextContributingRenderPassId(CCRenderPass::Id) con
CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const
{
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return 0;
}
« no previous file with comments | « cc/layer_impl.h ('k') | cc/layer_iterator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698