Allow assertions to be enabled in Blink Release builds.

Source/core/rendering/RenderLayerStackingNode.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 39 matching lines @@
 #include "public/platform/Platform.h"
 
 namespace WebCore {
 
 // FIXME: This should not require RenderLayer. There is currently a cycle where
 // in order to determine if we shoulBeNormalFlowOnly() we have to ask the render
 // layer about some of its state.
 RenderLayerStackingNode::RenderLayerStackingNode(RenderLayer* layer)
     : m_layer(layer)
     , m_normalFlowListDirty(true)
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     , m_layerListMutationAllowed(true)
     , m_stackingParent(0)
 #endif
 {
     m_isNormalFlowOnly = shouldBeNormalFlowOnly();
 
     // Non-stacking contexts should have empty z-order lists. As this is already the case,
     // there is no need to dirty / recompute these lists.
     m_zOrderListsDirty = isStackingContext();
 }
 
 RenderLayerStackingNode::~RenderLayerStackingNode()
 {
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     if (!renderer()->documentBeingDestroyed()) {
         ASSERT(!isInStackingParentZOrderLists());
         ASSERT(!isInStackingParentNormalFlowList());
 
         updateStackingParentForZOrderLists(0);
         updateStackingParentForNormalFlowList(0);
     }
 #endif
 }
 
 // Helper for the sorting of layers by z-index.
 static inline bool compareZIndex(RenderLayerStackingNode* first, RenderLayerStackingNode* second)
 {
     return first->zIndex() < second->zIndex();
 }
 
 RenderLayerCompositor* RenderLayerStackingNode::compositor() const
 {
     ASSERT(renderer()->view());
     return renderer()->view()->compositor();
 }
 
 void RenderLayerStackingNode::dirtyZOrderLists()
 {
     ASSERT(m_layerListMutationAllowed);
     ASSERT(isStackingContext());
 
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     updateStackingParentForZOrderLists(0);
 #endif
 
     if (m_posZOrderList)
         m_posZOrderList->clear();
     if (m_negZOrderList)
         m_negZOrderList->clear();
     m_zOrderListsDirty = true;
 
     if (!renderer()->documentBeingDestroyed())
         compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 void RenderLayerStackingNode::dirtyStackingContextZOrderLists()
 {
     if (RenderLayerStackingNode* stackingNode = ancestorStackingContextNode())
         stackingNode->dirtyZOrderLists();
 }
 
 void RenderLayerStackingNode::dirtyNormalFlowList()
 {
     ASSERT(m_layerListMutationAllowed);
 
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     updateStackingParentForNormalFlowList(0);
 #endif
 
     if (m_normalFlowList)
         m_normalFlowList->clear();
     m_normalFlowListDirty = true;
 
     if (!renderer()->documentBeingDestroyed())
         compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
@@ skipping 24 matching lines @@
             if (childElement && childElement->isInTopLayer()) {
                 RenderLayer* layer = toRenderLayerModelObject(child)->layer();
                 // Create the buffer if it doesn't exist yet.
                 if (!m_posZOrderList)
                     m_posZOrderList = adoptPtr(new Vector<RenderLayerStackingNode*>);
                 m_posZOrderList->append(layer->stackingNode());
             }
         }
     }
 
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     updateStackingParentForZOrderLists(this);
 #endif
 
     m_zOrderListsDirty = false;
 }
 
 void RenderLayerStackingNode::updateNormalFlowList()
 {
     if (!m_normalFlowListDirty)
         return;
 
     ASSERT(m_layerListMutationAllowed);
 
     for (RenderLayer* child = layer()->firstChild(); child; child = child->nextSibling()) {
         if (child->stackingNode()->isNormalFlowOnly() && (!layer()->reflectionInfo() || layer()->reflectionInfo()->reflectionLayer() != child)) {
             if (!m_normalFlowList)
                 m_normalFlowList = adoptPtr(new Vector<RenderLayerStackingNode*>);
             m_normalFlowList->append(child->stackingNode());
         }
     }
 
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
     updateStackingParentForNormalFlowList(this);
 #endif
 
     m_normalFlowListDirty = false;
 }
 
 void RenderLayerStackingNode::collectLayers(OwnPtr<Vector<RenderLayerStackingNode*> >& posBuffer, OwnPtr<Vector<RenderLayerStackingNode*> >& negBuffer)
 {
     if (layer()->isInTopLayer())
         return;
 
     if (!isNormalFlowOnly()) {
         OwnPtr<Vector<RenderLayerStackingNode*> >& buffer = (zIndex() >= 0) ? posBuffer : negBuffer;
         if (!buffer)
             buffer = adoptPtr(new Vector<RenderLayerStackingNode*>);
         buffer->append(this);
     }
 
     if (!isStackingContext()) {
         for (RenderLayer* child = layer()->firstChild(); child; child = child->nextSibling()) {
             if (!layer()->reflectionInfo() || layer()->reflectionInfo()->reflectionLayer() != child)
                 child->stackingNode()->collectLayers(posBuffer, negBuffer);
         }
     }
 }
 
-#if ASSERT_ENABLED
+#if ENABLE(ASSERT)
 bool RenderLayerStackingNode::isInStackingParentZOrderLists() const
 {
     if (!m_stackingParent || m_stackingParent->zOrderListsDirty())
         return false;
 
     if (m_stackingParent->posZOrderList() && m_stackingParent->posZOrderList()->find(this) != kNotFound)
         return true;
 
     if (m_stackingParent->negZOrderList() && m_stackingParent->negZOrderList()->find(this) != kNotFound)
         return true;
@@ skipping 89 matching lines @@
     }
     return 0;
 }
 
 RenderLayerModelObject* RenderLayerStackingNode::renderer() const
 {
     return m_layer->renderer();
 }
 
 } // namespace WebCore