diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 01:25:18 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 01:25:18 +0000 |
commit | e7f87cfba8e6f916dd88359ed9abf6ec6884d65d (patch) | |
tree | 289b3ec335cf58e6924f5a6fccd8e17ea1c6585a /cc/layer.cc | |
parent | bc3847a1ba39db7adec20aa9e0565f6e868e8480 (diff) | |
download | chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.zip chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.gz chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.bz2 |
Revert "cc: Switch to Chromium DCHECKs LOGs"
This reverts commit 162296. (https://chromiumcodereview.appspot.com/11048044)
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/11196014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer.cc')
-rw-r--r-- | cc/layer.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/layer.cc b/cc/layer.cc index 85a5221..a7b74c8 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. - DCHECK(!parent()); + ASSERT(!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) { - DCHECK(!layer || !layer->hasAncestor(this)); + ASSERT(!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) { - NOTREACHED(); + ASSERT_NOT_REACHED(); return; } @@ -234,7 +234,7 @@ void LayerChromium::removeAllChildren() { while (m_children.size()) { LayerChromium* layer = m_children[0].get(); - DCHECK(layer->parent()); + ASSERT(layer->parent()); layer->removeFromParent(); } } @@ -654,7 +654,7 @@ void LayerChromium::setBoundsContainPageScale(bool boundsContainPageScale) void LayerChromium::createRenderSurface() { - DCHECK(!m_renderSurface); + ASSERT(!m_renderSurface); m_renderSurface = make_scoped_ptr(new RenderSurfaceChromium(this)); setRenderTarget(this); } |