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

Unified Diff: cc/layer.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.h ('k') | cc/layer_animation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer.cc
diff --git a/cc/layer.cc b/cc/layer.cc
index a7b74c854b73e4f6e0e43d5af75ddeb822b3d786..85a52217d11a23ca3e999fdb28726337e8a395d5 100644
--- a/cc/layer.cc
+++ b/cc/layer.cc
@@ -77,7 +77,7 @@ LayerChromium::~LayerChromium()
{
// Our parent should be holding a reference to us so there should be no
// way for us to be destroyed while we still have a parent.
- ASSERT(!parent());
+ DCHECK(!parent());
// Remove the parent reference from all children.
removeAllChildren();
@@ -125,7 +125,7 @@ IntRect LayerChromium::layerRectToContentRect(const WebKit::WebRect& layerRect)
void LayerChromium::setParent(LayerChromium* layer)
{
- ASSERT(!layer || !layer->hasAncestor(this));
+ DCHECK(!layer || !layer->hasAncestor(this));
m_parent = layer;
setLayerTreeHost(m_parent ? m_parent->layerTreeHost() : 0);
}
@@ -186,7 +186,7 @@ void LayerChromium::replaceChild(LayerChromium* reference, scoped_refptr<LayerCh
int referenceIndex = indexOfChild(reference);
if (referenceIndex == -1) {
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return;
}
@@ -234,7 +234,7 @@ void LayerChromium::removeAllChildren()
{
while (m_children.size()) {
LayerChromium* layer = m_children[0].get();
- ASSERT(layer->parent());
+ DCHECK(layer->parent());
layer->removeFromParent();
}
}
@@ -654,7 +654,7 @@ void LayerChromium::setBoundsContainPageScale(bool boundsContainPageScale)
void LayerChromium::createRenderSurface()
{
- ASSERT(!m_renderSurface);
+ DCHECK(!m_renderSurface);
m_renderSurface = make_scoped_ptr(new RenderSurfaceChromium(this));
setRenderTarget(this);
}
« no previous file with comments | « cc/layer.h ('k') | cc/layer_animation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698