Rename isTreatedAsOrStackingContext to isStacked

third_party/WebKit/Source/core/paint/PaintLayerStackingNode.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 34 matching lines @@
 
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/paint/PaintLayer.h"
 #include "public/platform/Platform.h"
 #include <algorithm>
 
 namespace blink {
 
 // FIXME: This should not require PaintLayer. There is currently a cycle where
-// in order to determine if we shoulBeTreatedAsStackingContext() we have to ask the paint
+// in order to determine if we isStacked() we have to ask the paint
 // layer about some of its state.
 PaintLayerStackingNode::PaintLayerStackingNode(PaintLayer* layer)
     : m_layer(layer)
 #if ENABLE(ASSERT)
     , m_layerListMutationAllowed(true)
     , m_stackingParent(0)
 #endif
 {
-    m_isTreatedAsOrStackingContext = shouldBeTreatedAsOrStackingContext();
+    m_isStacked = layoutObject()->styleRef().isStacked();
 
     // 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();
 }
 
 PaintLayerStackingNode::~PaintLayerStackingNode()
 {
 #if ENABLE(ASSERT)
     if (!layoutObject()->documentBeingDestroyed()) {
@@ skipping 79 matching lines @@
 #endif
 
     m_zOrderListsDirty = false;
 }
 
 void PaintLayerStackingNode::collectLayers(OwnPtr<Vector<PaintLayerStackingNode*>>& posBuffer, OwnPtr<Vector<PaintLayerStackingNode*>>& negBuffer)
 {
     if (layer()->isInTopLayer())
         return;
 
-    if (isTreatedAsOrStackingContext()) {
+    if (isStacked()) {
         OwnPtr<Vector<PaintLayerStackingNode*>>& buffer = (zIndex() >= 0) ? posBuffer : negBuffer;
         if (!buffer)
             buffer = adoptPtr(new Vector<PaintLayerStackingNode*>);
         buffer->append(this);
     }
 
     if (!isStackingContext()) {
         for (PaintLayer* child = layer()->firstChild(); child; child = child->nextSibling()) {
             if (!layer()->reflectionInfo() || layer()->reflectionInfo()->reflectionLayer() != child)
                 child->stackingNode()->collectLayers(posBuffer, negBuffer);
@@ skipping 35 matching lines @@
 {
     updateZOrderLists();
 
     if (!layer()->reflectionInfo())
         return;
 
     PaintLayer* reflectionLayer = layer()->reflectionInfo()->reflectionLayer();
     reflectionLayer->stackingNode()->updateZOrderLists();
 }
 
-void PaintLayerStackingNode::updateStackingNodesAfterStyleChange(const ComputedStyle* oldStyle)
+void PaintLayerStackingNode::styleDidChange(const ComputedStyle* oldStyle)
 {
-    bool wasStackingContext = oldStyle ? !oldStyle->hasAutoZIndex() : false;
+    bool wasStackingContext = oldStyle ? oldStyle->isStackingContext() : false;
     int oldZIndex = oldStyle ? oldStyle->zIndex() : 0;
 
     bool isStackingContext = this->isStackingContext();
-    if (isStackingContext == wasStackingContext && oldZIndex == zIndex())
+    bool shouldBeStacked = layoutObject()->styleRef().isStacked();
+    if (isStackingContext == wasStackingContext && m_isStacked == shouldBeStacked && oldZIndex == zIndex())
         return;
 
     dirtyStackingContextZOrderLists();
 
     if (isStackingContext)
         dirtyZOrderLists();
     else
         clearZOrderLists();
-}
 
-void PaintLayerStackingNode::updateIsTreatedAsStackingContext()
-{
-    bool isTreatedAsOrStackingContext = shouldBeTreatedAsOrStackingContext();
-    if (isTreatedAsOrStackingContext == this->isTreatedAsOrStackingContext())
-        return;
-
-    m_isTreatedAsOrStackingContext = isTreatedAsOrStackingContext;
-    if (!layoutObject()->documentBeingDestroyed() && !layer()->isRootLayer())
-        compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
-    dirtyStackingContextZOrderLists();
+    if (m_isStacked != shouldBeStacked) {
+        m_isStacked = shouldBeStacked;
+        if (!layoutObject()->documentBeingDestroyed() && !layer()->isRootLayer())
+            compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
+    }
 }
 
 PaintLayerStackingNode* PaintLayerStackingNode::ancestorStackingContextNode() const
 {
     for (PaintLayer* ancestor = layer()->parent(); ancestor; ancestor = ancestor->parent()) {
         PaintLayerStackingNode* stackingNode = ancestor->stackingNode();
         if (stackingNode->isStackingContext())
             return stackingNode;
     }
     return 0;
 }
 
 LayoutBoxModelObject* PaintLayerStackingNode::layoutObject() const
 {
     return m_layer->layoutObject();
 }
 
 } // namespace blink