Index: cc/LayerChromium.cpp |
diff --git a/cc/LayerChromium.cpp b/cc/LayerChromium.cpp |
index d271eb47e12de5470eba0e9a4957052450bee326..beb69208739580be79857b704c2f7629c19ef449 100644 |
--- a/cc/LayerChromium.cpp |
+++ b/cc/LayerChromium.cpp |
@@ -78,7 +78,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(); |
@@ -126,7 +126,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); |
} |
@@ -187,7 +187,7 @@ void LayerChromium::replaceChild(LayerChromium* reference, scoped_refptr<LayerCh |
int referenceIndex = indexOfChild(reference); |
if (referenceIndex == -1) { |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return; |
} |
@@ -235,7 +235,7 @@ void LayerChromium::removeAllChildren() |
{ |
while (m_children.size()) { |
LayerChromium* layer = m_children[0].get(); |
- ASSERT(layer->parent()); |
+ DCHECK(layer->parent()); |
layer->removeFromParent(); |
} |
} |
@@ -655,7 +655,7 @@ void LayerChromium::setBoundsContainPageScale(bool boundsContainPageScale) |
void LayerChromium::createRenderSurface() |
{ |
- ASSERT(!m_renderSurface); |
+ DCHECK(!m_renderSurface); |
m_renderSurface = adoptPtr(new RenderSurfaceChromium(this)); |
setRenderTarget(this); |
} |