Index: Source/core/rendering/compositing/CompositedLayerMapping.cpp |
diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/Source/core/rendering/compositing/CompositedLayerMapping.cpp |
index 44a485b1893ff5b85fe5d9474fd63d164acc3e25..3662f0520ec4a0cb336520597616ba85d6a68f9f 100644 |
--- a/Source/core/rendering/compositing/CompositedLayerMapping.cpp |
+++ b/Source/core/rendering/compositing/CompositedLayerMapping.cpp |
@@ -1635,7 +1635,7 @@ bool CompositedLayerMapping::hasVisibleNonCompositingDescendant(RenderLayer* par |
// FIXME: We shouldn't be called with a stale z-order lists. See bug 85512. |
parent->stackingNode()->updateLayerListsIfNeeded(); |
-#if ASSERT_ENABLED |
+#if ENABLE(ASSERT) |
LayerListMutationDetector mutationChecker(parent->stackingNode()); |
#endif |
@@ -2021,7 +2021,7 @@ void CompositedLayerMapping::doPaintTask(GraphicsLayerPaintInfo& paintInfo, Grap |
dirtyRect.move(roundedIntSize(paintInfo.renderLayer->subpixelAccumulation())); |
} |
-#ifndef NDEBUG |
+#if ENABLE(ASSERT) |
paintInfo.renderLayer->renderer()->assertSubtreeIsLaidOut(); |
#endif |
@@ -2073,7 +2073,7 @@ void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, G |
{ |
// https://code.google.com/p/chromium/issues/detail?id=343772 |
DisableCompositingQueryAsserts disabler; |
-#ifndef NDEBUG |
+#if ENABLE(ASSERT) |
// FIXME: once the state machine is ready, this can be removed and we can refer to that instead. |
if (Page* page = renderer()->frame()->page()) |
page->setIsPainting(true); |
@@ -2119,7 +2119,7 @@ void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, G |
context.restore(); |
} |
InspectorInstrumentation::didPaint(m_owningLayer.renderer(), graphicsLayer, &context, clip); |
-#ifndef NDEBUG |
+#if ENABLE(ASSERT) |
if (Page* page = renderer()->frame()->page()) |
page->setIsPainting(false); |
#endif |
@@ -2131,7 +2131,7 @@ bool CompositedLayerMapping::isTrackingRepaints() const |
return client ? client->isTrackingRepaints() : false; |
} |
-#ifndef NDEBUG |
+#if ENABLE(ASSERT) |
void CompositedLayerMapping::verifyNotPainting() |
{ |
ASSERT(!renderer()->frame()->page() || !renderer()->frame()->page()->isPainting()); |