| Index: Source/core/rendering/RenderLayer.cpp
 | 
| diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
 | 
| index c0785804562e00218aaad3928ba5cde48310074c..838332b7cc3b8bb8eba92c9af9b5c3ed564bc246 100644
 | 
| --- a/Source/core/rendering/RenderLayer.cpp
 | 
| +++ b/Source/core/rendering/RenderLayer.cpp
 | 
| @@ -702,20 +702,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();
 | 
| @@ -2111,7 +2097,7 @@ void RenderLayer::didUpdateNeedsCompositedScrolling()
 | 
|  
 | 
|      dirtyStackingContainerZOrderLists();
 | 
|  
 | 
| -    compositor()->setShouldReevaluateCompositingAfterLayout();
 | 
| +    compositor()->setNeedsToRecomputeCompositingRequirements();
 | 
|      compositor()->setCompositingLayersNeedRebuild();
 | 
|  }
 | 
|  
 | 
| @@ -4510,7 +4496,7 @@ void RenderLayer::dirtyZOrderLists()
 | 
|          compositor()->setNeedsUpdateCompositingRequirementsState();
 | 
|          compositor()->setCompositingLayersNeedRebuild();
 | 
|          if (acceleratedCompositingForOverflowScrollEnabled())
 | 
| -            compositor()->setShouldReevaluateCompositingAfterLayout();
 | 
| +            compositor()->setNeedsToRecomputeCompositingRequirements();
 | 
|      }
 | 
|  }
 | 
|  
 | 
| @@ -4547,7 +4533,7 @@ void RenderLayer::dirtyNormalFlowList()
 | 
|      if (!renderer()->documentBeingDestroyed()) {
 | 
|          compositor()->setCompositingLayersNeedRebuild();
 | 
|          if (acceleratedCompositingForOverflowScrollEnabled())
 | 
| -            compositor()->setShouldReevaluateCompositingAfterLayout();
 | 
| +            compositor()->setNeedsToRecomputeCompositingRequirements();
 | 
|      }
 | 
|  }
 | 
|  
 | 
| @@ -5272,6 +5258,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)
 | 
| 
 |