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

Unified Diff: cc/layer_tree_host.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_tiling_data.cc ('k') | cc/layer_tree_host_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host.cc
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index 73d6054db0169a841b0f0ba95fc3490174da48e7..a571506afd5ed33242544ba619e3a3422d4e20fb 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -111,7 +111,7 @@ CCLayerTreeHost::CCLayerTreeHost(CCLayerTreeHostClient* client, const CCLayerTre
, m_hasTransparentBackground(false)
, m_partialTextureUpdateRequests(0)
{
- ASSERT(CCProxy::isMainThread());
+ DCHECK(CCProxy::isMainThread());
numLayerTreeInstances++;
}
@@ -132,9 +132,9 @@ CCLayerTreeHost::~CCLayerTreeHost()
{
if (m_rootLayer)
m_rootLayer->setLayerTreeHost(0);
- ASSERT(CCProxy::isMainThread());
+ DCHECK(CCProxy::isMainThread());
TRACE_EVENT0("cc", "CCLayerTreeHost::~CCLayerTreeHost");
- ASSERT(m_proxy.get());
+ DCHECK(m_proxy.get());
m_proxy->stop();
m_proxy.reset();
numLayerTreeInstances--;
@@ -177,7 +177,7 @@ void CCLayerTreeHost::initializeRenderer()
CCLayerTreeHost::RecreateResult CCLayerTreeHost::recreateContext()
{
TRACE_EVENT0("cc", "CCLayerTreeHost::recreateContext");
- ASSERT(m_contextLost);
+ DCHECK(m_contextLost);
bool recreated = false;
if (!m_numTimesRecreateShouldFail)
@@ -211,14 +211,14 @@ CCLayerTreeHost::RecreateResult CCLayerTreeHost::recreateContext()
void CCLayerTreeHost::deleteContentsTexturesOnImplThread(CCResourceProvider* resourceProvider)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
if (m_rendererInitialized)
m_contentsTextureManager->clearAllMemory(resourceProvider);
}
void CCLayerTreeHost::acquireLayerTextures()
{
- ASSERT(CCProxy::isMainThread());
+ DCHECK(CCProxy::isMainThread());
m_proxy->acquireLayerTextures();
}
@@ -239,7 +239,7 @@ void CCLayerTreeHost::layout()
void CCLayerTreeHost::beginCommitOnImplThread(CCLayerTreeHostImpl* hostImpl)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
TRACE_EVENT0("cc", "CCLayerTreeHost::commitTo");
}
@@ -250,7 +250,7 @@ void CCLayerTreeHost::beginCommitOnImplThread(CCLayerTreeHostImpl* hostImpl)
// after the commit, but on the main thread.
void CCLayerTreeHost::finishCommitOnImplThread(CCLayerTreeHostImpl* hostImpl)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
m_contentsTextureManager->updateBackingsInDrawingImplTree();
m_contentsTextureManager->reduceMemory(hostImpl->resourceProvider());
@@ -322,7 +322,7 @@ scoped_ptr<CCLayerTreeHostImpl> CCLayerTreeHost::createLayerTreeHostImpl(CCLayer
void CCLayerTreeHost::didLoseContext()
{
TRACE_EVENT0("cc", "CCLayerTreeHost::didLoseContext");
- ASSERT(CCProxy::isMainThread());
+ DCHECK(CCProxy::isMainThread());
m_contextLost = true;
m_numFailedRecreateAttempts = 0;
setNeedsCommit();
@@ -356,7 +356,7 @@ const RendererCapabilities& CCLayerTreeHost::rendererCapabilities() const
void CCLayerTreeHost::setNeedsAnimate()
{
- ASSERT(CCProxy::hasImplThread());
+ DCHECK(CCProxy::hasImplThread());
m_proxy->setNeedsAnimate();
}
@@ -379,7 +379,7 @@ bool CCLayerTreeHost::commitRequested() const
void CCLayerTreeHost::setAnimationEvents(scoped_ptr<CCAnimationEventsVector> events, double wallClockTime)
{
- ASSERT(CCThreadProxy::isMainThread());
+ DCHECK(CCThreadProxy::isMainThread());
setAnimationEventsRecursive(*events.get(), m_rootLayer.get(), wallClockTime);
}
@@ -455,7 +455,7 @@ CCPrioritizedTextureManager* CCLayerTreeHost::contentsTextureManager() const
void CCLayerTreeHost::composite()
{
- ASSERT(!CCThreadProxy::implThread());
+ DCHECK(!CCThreadProxy::implThread());
static_cast<CCSingleThreadProxy*>(m_proxy.get())->compositeImmediately();
}
@@ -481,8 +481,8 @@ bool CCLayerTreeHost::initializeRendererIfNeeded()
void CCLayerTreeHost::updateLayers(CCTextureUpdateQueue& queue, size_t memoryAllocationLimitBytes)
{
- ASSERT(m_rendererInitialized);
- ASSERT(memoryAllocationLimitBytes);
+ DCHECK(m_rendererInitialized);
+ DCHECK(memoryAllocationLimitBytes);
if (!rootLayer())
return;
@@ -673,10 +673,10 @@ bool CCLayerTreeHost::paintLayerContents(const LayerList& renderSurfaceLayerList
occlusionTracker.enterLayer(it);
if (it.representsTargetRenderSurface()) {
- ASSERT(it->renderSurface()->drawOpacity() || it->renderSurface()->drawOpacityIsAnimating());
+ DCHECK(it->renderSurface()->drawOpacity() || it->renderSurface()->drawOpacityIsAnimating());
needMoreUpdates |= paintMasksForRenderSurface(*it, queue);
} else if (it.representsItself()) {
- ASSERT(!it->bounds().isEmpty());
+ DCHECK(!it->bounds().isEmpty());
it->update(queue, &occlusionTracker, m_renderingStats);
needMoreUpdates |= it->needMoreUpdates();
}
@@ -720,7 +720,7 @@ void CCLayerTreeHost::startRateLimiter(WebKit::WebGraphicsContext3D* context)
if (m_animating)
return;
- ASSERT(context);
+ DCHECK(context);
RateLimiterMap::iterator it = m_rateLimiters.find(context);
if (it != m_rateLimiters.end())
it->second->start();
« no previous file with comments | « cc/layer_tiling_data.cc ('k') | cc/layer_tree_host_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698