| Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
|
| index a85e695699fc149224079257648d1178fb773eeb..e1422289c6e523c0c9e0ece1cf0f47d2b204ee02 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
|
| @@ -936,7 +936,7 @@ LayoutPoint PaintLayer::computeOffsetFromTransformedAncestor() const
|
|
|
| PaintLayer* PaintLayer::compositingContainer() const
|
| {
|
| - if (!stackingNode()->isTreatedAsOrStackingContext())
|
| + if (!stackingNode()->isStacked())
|
| return parent();
|
| if (PaintLayerStackingNode* ancestorStackingNode = stackingNode()->ancestorStackingContextNode())
|
| return ancestorStackingNode->layer();
|
| @@ -1213,10 +1213,10 @@ void PaintLayer::addChild(PaintLayer* child, PaintLayer* beforeChild)
|
|
|
| setNeedsCompositingInputsUpdate();
|
|
|
| - if (!child->stackingNode()->isTreatedAsOrStackingContext() && !layoutObject()->documentBeingDestroyed())
|
| + if (!child->stackingNode()->isStacked() && !layoutObject()->documentBeingDestroyed())
|
| compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
|
|
|
| - if (child->stackingNode()->isTreatedAsOrStackingContext() || child->firstChild()) {
|
| + if (child->stackingNode()->isStacked() || child->firstChild()) {
|
| // Dirty the z-order list in which we are contained. The ancestorStackingContextNode() can be null in the
|
| // case where we're building up generated content layers. This is ok, since the lists will start
|
| // off dirty in that case anyway.
|
| @@ -1247,10 +1247,10 @@ PaintLayer* PaintLayer::removeChild(PaintLayer* oldChild)
|
| if (m_last == oldChild)
|
| m_last = oldChild->previousSibling();
|
|
|
| - if (!oldChild->stackingNode()->isTreatedAsOrStackingContext() && !layoutObject()->documentBeingDestroyed())
|
| + if (!oldChild->stackingNode()->isStacked() && !layoutObject()->documentBeingDestroyed())
|
| compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
|
|
|
| - if (oldChild->stackingNode()->isTreatedAsOrStackingContext() || oldChild->firstChild()) {
|
| + if (oldChild->stackingNode()->isStacked() || oldChild->firstChild()) {
|
| // Dirty the z-order list in which we are contained. When called via the
|
| // reattachment process in removeOnlyThisLayer, the layer may already be disconnected
|
| // from the main layer tree, so we need to null-check the
|
| @@ -2577,7 +2577,7 @@ void PaintLayer::styleChanged(StyleDifference diff, const ComputedStyle* oldStyl
|
| if (attemptDirectCompositingUpdate(diff, oldStyle))
|
| return;
|
|
|
| - m_stackingNode->updateIsTreatedAsStackingContext();
|
| + m_stackingNode->updateIsStacked();
|
| m_stackingNode->updateStackingNodesAfterStyleChange(oldStyle);
|
|
|
| if (m_scrollableArea)
|
|
|