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

Unified Diff: cc/render_surface_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/render_surface_filters.cc ('k') | cc/resource_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/render_surface_impl.cc
diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc
index e5f0324802fe4e7ed2cd38b5e957e391b0a65799..17eaffe4c8dcf351bc60f92f790e65860fe8ad53 100644
--- a/cc/render_surface_impl.cc
+++ b/cc/render_surface_impl.cc
@@ -6,6 +6,7 @@
#include "CCRenderSurface.h"
+#include "base/logging.h"
#include "base/stringprintf.h"
#include "CCDamageTracker.h"
#include "CCDebugBorderDrawQuad.h"
@@ -134,7 +135,7 @@ bool CCRenderSurface::surfacePropertyChanged() const
// - all other property changes come from the owning layer (or some ancestor layer
// that propagates its change to the owning layer).
//
- ASSERT(m_owningLayer);
+ DCHECK(m_owningLayer);
return m_surfacePropertyChanged || m_owningLayer->layerPropertyChanged();
}
@@ -145,7 +146,7 @@ bool CCRenderSurface::surfacePropertyChangedOnlyFromDescendant() const
void CCRenderSurface::addContributingDelegatedRenderPassLayer(CCLayerImpl* layer)
{
- ASSERT(std::find(m_layerList.begin(), m_layerList.end(), layer) != m_layerList.end());
+ DCHECK(std::find(m_layerList.begin(), m_layerList.end(), layer) != m_layerList.end());
CCDelegatedRendererLayerImpl* delegatedRendererLayer = static_cast<CCDelegatedRendererLayerImpl*>(layer);
m_contributingDelegatedRenderPassLayerList.push_back(delegatedRendererLayer);
}
@@ -158,7 +159,7 @@ void CCRenderSurface::clearLayerLists()
static inline IntRect computeClippedRectInTarget(const CCLayerImpl* owningLayer)
{
- ASSERT(owningLayer->parent());
+ DCHECK(owningLayer->parent());
const CCLayerImpl* renderTarget = owningLayer->parent()->renderTarget();
const CCRenderSurface* self = owningLayer->renderSurface();
@@ -180,7 +181,7 @@ CCRenderPass::Id CCRenderSurface::renderPassId()
{
int layerId = m_owningLayer->id();
int subId = 0;
- ASSERT(layerId > 0);
+ DCHECK(layerId > 0);
return CCRenderPass::Id(layerId, subId);
}
@@ -198,7 +199,7 @@ void CCRenderSurface::appendRenderPasses(CCRenderPassSink& passSink)
void CCRenderSurface::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData, bool forReplica, CCRenderPass::Id renderPassId)
{
- ASSERT(!forReplica || m_owningLayer->hasReplica());
+ DCHECK(!forReplica || m_owningLayer->hasReplica());
IntRect clippedRectInTarget = computeClippedRectInTarget(m_owningLayer);
bool isOpaque = false;
« no previous file with comments | « cc/render_surface_filters.cc ('k') | cc/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698