| Index: Source/core/rendering/compositing/CompositedLayerMapping.cpp
|
| diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
|
| index 39897775891fe5305417a5a7100675a030817f6f..5bbab31abfa8de7fbc500aafa5e064323a004eb1 100644
|
| --- a/Source/core/rendering/compositing/CompositedLayerMapping.cpp
|
| +++ b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
|
| @@ -2018,7 +2018,7 @@ void CompositedLayerMapping::doPaintTask(GraphicsLayerPaintInfo& paintInfo, Grap
|
| dirtyRect.move(roundedIntSize(paintInfo.renderLayer->subpixelAccumulation()));
|
| }
|
|
|
| -#ifndef NDEBUG
|
| +#if ENABLE(ASSERT)
|
| paintInfo.renderLayer->renderer()->assertSubtreeIsLaidOut();
|
| #endif
|
|
|
| @@ -2070,7 +2070,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);
|
| @@ -2116,7 +2116,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
|
| @@ -2128,7 +2128,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());
|
|
|