| Index: Source/core/rendering/RenderLayer.cpp
|
| diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
|
| index a9b44c28bedbf20bfdfdd8b406e6b221a5d23056..ffcb43efc31f46cdd35aea3f1d6f516c24e3f077 100644
|
| --- a/Source/core/rendering/RenderLayer.cpp
|
| +++ b/Source/core/rendering/RenderLayer.cpp
|
| @@ -701,20 +701,6 @@ void RenderLayer::updateLayerPositionsAfterScroll(RenderGeometryMap* geometryMap
|
| geometryMap->popMappingsToAncestor(parent());
|
| }
|
|
|
| -void RenderLayer::positionNewlyCreatedOverflowControls()
|
| -{
|
| - if (!compositedLayerMapping()->hasUnpositionedOverflowControlsLayers())
|
| - return;
|
| -
|
| - RenderGeometryMap geometryMap(UseTransforms);
|
| - RenderView* view = renderer()->view();
|
| - if (this != view->layer() && parent())
|
| - geometryMap.pushMappingsToAncestor(parent(), 0);
|
| -
|
| - LayoutPoint offsetFromRoot = LayoutPoint(geometryMap.absolutePoint(FloatPoint()));
|
| - positionOverflowControls(toIntSize(roundedIntPoint(offsetFromRoot)));
|
| -}
|
| -
|
| bool RenderLayer::hasBlendMode() const
|
| {
|
| return RuntimeEnabledFeatures::cssCompositingEnabled() && renderer()->hasBlendMode();
|
| @@ -2035,7 +2021,7 @@ void RenderLayer::didUpdateNeedsCompositedScrolling()
|
|
|
| dirtyStackingContainerZOrderLists();
|
|
|
| - compositor()->setShouldReevaluateCompositingAfterLayout();
|
| + compositor()->setNeedsToRecomputeCompositingRequirements();
|
| compositor()->setCompositingLayersNeedRebuild();
|
| }
|
|
|
| @@ -4548,7 +4534,7 @@ void RenderLayer::dirtyZOrderLists()
|
| compositor()->setNeedsUpdateCompositingRequirementsState();
|
| compositor()->setCompositingLayersNeedRebuild();
|
| if (acceleratedCompositingForOverflowScrollEnabled())
|
| - compositor()->setShouldReevaluateCompositingAfterLayout();
|
| + compositor()->setNeedsToRecomputeCompositingRequirements();
|
| }
|
| }
|
|
|
| @@ -4585,7 +4571,7 @@ void RenderLayer::dirtyNormalFlowList()
|
| if (!renderer()->documentBeingDestroyed()) {
|
| compositor()->setCompositingLayersNeedRebuild();
|
| if (acceleratedCompositingForOverflowScrollEnabled())
|
| - compositor()->setShouldReevaluateCompositingAfterLayout();
|
| + compositor()->setNeedsToRecomputeCompositingRequirements();
|
| }
|
| }
|
|
|
| @@ -5318,6 +5304,17 @@ IntRect RenderLayer::scrollCornerAndResizerRect() const
|
| return m_scrollableArea->scrollCornerAndResizerRect();
|
| }
|
|
|
| +void RenderLayer::positionOverflowControls()
|
| +{
|
| + RenderGeometryMap geometryMap(UseTransforms);
|
| + RenderView* view = renderer()->view();
|
| + if (this != view->layer() && parent())
|
| + geometryMap.pushMappingsToAncestor(parent(), 0);
|
| +
|
| + LayoutPoint offsetFromRoot = LayoutPoint(geometryMap.absolutePoint(FloatPoint()));
|
| + positionOverflowControls(toIntSize(roundedIntPoint(offsetFromRoot)));
|
| +}
|
| +
|
| void RenderLayer::positionOverflowControls(const IntSize& offsetFromRoot)
|
| {
|
| if (m_scrollableArea)
|
|
|