Rename isNormalFlowOnly to something meaningful

Source/core/paint/DeprecatedPaintLayerStackingNode.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 37 matching lines @@
 #include "core/layout/HitTestRequest.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
 #include "core/paint/DeprecatedPaintLayer.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 // FIXME: This should not require DeprecatedPaintLayer. There is currently a cycle where
-// in order to determine if we shoulBeNormalFlowOnly() we have to ask the paint
+// in order to determine if we shoulBeTreatedAsStackingContextForPainting() we have to ask the paint
 // layer about some of its state.
 DeprecatedPaintLayerStackingNode::DeprecatedPaintLayerStackingNode(DeprecatedPaintLayer* layer)
     : m_layer(layer)
     , m_normalFlowListDirty(true)
 #if ENABLE(ASSERT)
     , m_layerListMutationAllowed(true)
     , m_stackingParent(0)
 #endif
 {
-    m_isNormalFlowOnly = shouldBeNormalFlowOnly();
+    m_isTreatedAsStackingContextForPainting = shouldBeTreatedAsStackingContextForPainting();
 
     // 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();
 }
 
 DeprecatedPaintLayerStackingNode::~DeprecatedPaintLayerStackingNode()
 {
 #if ENABLE(ASSERT)
     if (!layoutObject()->documentBeingDestroyed()) {
@@ skipping 100 matching lines @@
 }
 
 void DeprecatedPaintLayerStackingNode::updateNormalFlowList()
 {
     if (!m_normalFlowListDirty)
         return;
 
     ASSERT(m_layerListMutationAllowed);
 
     for (DeprecatedPaintLayer* child = layer()->firstChild(); child; child = child->nextSibling()) {
-        if (child->stackingNode()->isNormalFlowOnly() && (!layer()->reflectionInfo() || layer()->reflectionInfo()->reflectionLayer() != child)) {
+        if (!child->stackingNode()->isTreatedAsStackingContextForPainting() && (!layer()->reflectionInfo() || layer()->reflectionInfo()->reflectionLayer() != child)) {
             if (!m_normalFlowList)
                 m_normalFlowList = adoptPtr(new Vector<DeprecatedPaintLayerStackingNode*>);
             m_normalFlowList->append(child->stackingNode());
         }
     }
 
 #if ENABLE(ASSERT)
     updateStackingParentForNormalFlowList(this);
 #endif
 
     m_normalFlowListDirty = false;
 }
 
 void DeprecatedPaintLayerStackingNode::collectLayers(OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>>& posBuffer, OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>>& negBuffer)
 {
     if (layer()->isInTopLayer())
         return;
 
-    if (!isNormalFlowOnly()) {
+    if (isTreatedAsStackingContextForPainting()) {
         OwnPtr<Vector<DeprecatedPaintLayerStackingNode*>>& buffer = (zIndex() >= 0) ? posBuffer : negBuffer;
         if (!buffer)
             buffer = adoptPtr(new Vector<DeprecatedPaintLayerStackingNode*>);
         buffer->append(this);
     }
 
     if (!isStackingContext()) {
         for (DeprecatedPaintLayer* child = layer()->firstChild(); child; child = child->nextSibling()) {
             if (!layer()->reflectionInfo() || layer()->reflectionInfo()->reflectionLayer() != child)
                 child->stackingNode()->collectLayers(posBuffer, negBuffer);
@@ skipping 69 matching lines @@
         return;
 
     dirtyStackingContextZOrderLists();
 
     if (isStackingContext)
         dirtyZOrderLists();
     else
         clearZOrderLists();
 }
 
-// FIXME: Rename shouldBeNormalFlowOnly to something more accurate now that CSS
-// 2.1 defines the term "normal flow".
-bool DeprecatedPaintLayerStackingNode::shouldBeNormalFlowOnly() const
+void DeprecatedPaintLayerStackingNode::updateIsTreatedAsStackingContextForPainting()
 {
-    return !isStackingContext() && !layoutObject()->isPositioned();
-}
-
-void DeprecatedPaintLayerStackingNode::updateIsNormalFlowOnly()
-{
-    bool isNormalFlowOnly = shouldBeNormalFlowOnly();
-    if (isNormalFlowOnly == this->isNormalFlowOnly())
+    bool isTreatedAsStackingContextForPainting = shouldBeTreatedAsStackingContextForPainting();
+    if (isTreatedAsStackingContextForPainting == this->isTreatedAsStackingContextForPainting())
         return;
 
-    m_isNormalFlowOnly = isNormalFlowOnly;
+    m_isTreatedAsStackingContextForPainting = isTreatedAsStackingContextForPainting;
     if (DeprecatedPaintLayer* p = layer()->parent())
         p->stackingNode()->dirtyNormalFlowList();
     dirtyStackingContextZOrderLists();
 }
 
 DeprecatedPaintLayerStackingNode* DeprecatedPaintLayerStackingNode::ancestorStackingContextNode() const
 {
     for (DeprecatedPaintLayer* ancestor = layer()->parent(); ancestor; ancestor = ancestor->parent()) {
         DeprecatedPaintLayerStackingNode* stackingNode = ancestor->stackingNode();
         if (stackingNode->isStackingContext())
@@ skipping 52 matching lines @@
     Node* node = result.innerNode();
     if (node && !result.URLElement())
         result.setURLElement(node->enclosingLinkEventParentOrSelf());
 
     // Now return whether we were inside this layer (this will always be true for the root
     // layer).
     return insideLayer;
 }
 
 } // namespace blink