| Index: third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
|
| index 46652d9eae9582bf4017fb8708d824a35d7b34db..6782b558f5d8b503c8eb9bf89a8567e21c14769c 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
|
| @@ -152,6 +152,12 @@ void CompositingInputsUpdater::updateRecursive(PaintLayer* layer, UpdateType upd
|
| const PaintLayer* parentLayerOnClippingContainerChain = findParentLayerOnClippingContainerChain(layer);
|
| const bool parentHasClipRelatedProperty = parentLayerOnClippingContainerChain->layoutObject()->hasClipRelatedProperty();
|
| properties.clippingContainer = parentHasClipRelatedProperty ? parentLayerOnClippingContainerChain->layoutObject() : parentLayerOnClippingContainerChain->clippingContainer();
|
| +
|
| + if (layer->layoutObject()->isOutOfFlowPositioned() && !layer->subtreeIsInvisible()) {
|
| + const PaintLayer* clippingLayer = properties.clippingContainer ? properties.clippingContainer->enclosingLayer() : layer->compositor()->rootLayer();
|
| + if (hasClippedStackingAncestor(layer, clippingLayer))
|
| + rareProperties.clipParent = clippingLayer;
|
| + }
|
| }
|
|
|
| if (info.lastScrollingAncestor) {
|
| @@ -162,12 +168,6 @@ void CompositingInputsUpdater::updateRecursive(PaintLayer* layer, UpdateType upd
|
| if (parentLayerOnContainingBlockChain->scrollsOverflow())
|
| rareProperties.ancestorScrollingLayer = parentLayerOnContainingBlockChain;
|
|
|
| - if (layer->layoutObject()->isOutOfFlowPositioned() && !layer->subtreeIsInvisible()) {
|
| - const PaintLayer* clippingLayer = properties.clippingContainer ? properties.clippingContainer->enclosingLayer() : layer->compositor()->rootLayer();
|
| - if (hasClippedStackingAncestor(layer, clippingLayer))
|
| - rareProperties.clipParent = clippingLayer;
|
| - }
|
| -
|
| if (layer->stackingNode()->isStacked()
|
| && rareProperties.ancestorScrollingLayer
|
| && !info.ancestorStackingContext->layoutObject()->isDescendantOf(rareProperties.ancestorScrollingLayer->layoutObject()))
|
|
|