| Index: Source/core/rendering/RenderLayerStackingNode.cpp
|
| diff --git a/Source/core/rendering/RenderLayerStackingNode.cpp b/Source/core/rendering/RenderLayerStackingNode.cpp
|
| index 3b64dad67ab9f140dfa0b2a86dd53b3fa14f435c..8ee81f12cf8bbbad6b90d5276352a8c8919d75e6 100644
|
| --- a/Source/core/rendering/RenderLayerStackingNode.cpp
|
| +++ b/Source/core/rendering/RenderLayerStackingNode.cpp
|
| @@ -57,7 +57,7 @@ namespace WebCore {
|
| RenderLayerStackingNode::RenderLayerStackingNode(RenderLayer* layer)
|
| : m_layer(layer)
|
| , m_normalFlowListDirty(true)
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| , m_layerListMutationAllowed(true)
|
| , m_stackingParent(0)
|
| #endif
|
| @@ -71,7 +71,7 @@ RenderLayerStackingNode::RenderLayerStackingNode(RenderLayer* layer)
|
|
|
| RenderLayerStackingNode::~RenderLayerStackingNode()
|
| {
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| if (!renderer()->documentBeingDestroyed()) {
|
| ASSERT(!isInStackingParentZOrderLists());
|
| ASSERT(!isInStackingParentNormalFlowList());
|
| @@ -99,7 +99,7 @@ void RenderLayerStackingNode::dirtyZOrderLists()
|
| ASSERT(m_layerListMutationAllowed);
|
| ASSERT(isStackingContext());
|
|
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| updateStackingParentForZOrderLists(0);
|
| #endif
|
|
|
| @@ -123,7 +123,7 @@ void RenderLayerStackingNode::dirtyNormalFlowList()
|
| {
|
| ASSERT(m_layerListMutationAllowed);
|
|
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| updateStackingParentForNormalFlowList(0);
|
| #endif
|
|
|
| @@ -168,7 +168,7 @@ void RenderLayerStackingNode::rebuildZOrderLists()
|
| }
|
| }
|
|
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| updateStackingParentForZOrderLists(this);
|
| #endif
|
|
|
| @@ -190,7 +190,7 @@ void RenderLayerStackingNode::updateNormalFlowList()
|
| }
|
| }
|
|
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| updateStackingParentForNormalFlowList(this);
|
| #endif
|
|
|
| @@ -217,7 +217,7 @@ void RenderLayerStackingNode::collectLayers(OwnPtr<Vector<RenderLayerStackingNod
|
| }
|
| }
|
|
|
| -#if ASSERT_ENABLED
|
| +#if ENABLE(ASSERT)
|
| bool RenderLayerStackingNode::isInStackingParentZOrderLists() const
|
| {
|
| if (!m_stackingParent || m_stackingParent->zOrderListsDirty())
|
|
|