| 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;
|
| }
|
|
|
|
|