Merge 159961 "Defer the real work in updateCompositingLayers unt..."

Source/core/rendering/RenderLayer.cpp

Index: Source/core/rendering/RenderLayer.cpp
===================================================================
--- Source/core/rendering/RenderLayer.cpp	(revision 159992)
+++ Source/core/rendering/RenderLayer.cpp	(working copy)
@@ -701,20 +701,6 @@
         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();
@@ -2110,7 +2096,7 @@
 
     dirtyStackingContainerZOrderLists();
 
-    compositor()->setShouldReevaluateCompositingAfterLayout();
+    compositor()->setNeedsToRecomputeCompositingRequirements();
     compositor()->setCompositingLayersNeedRebuild();
 }
 
@@ -4509,7 +4495,7 @@
         compositor()->setNeedsUpdateCompositingRequirementsState();
         compositor()->setCompositingLayersNeedRebuild();
         if (acceleratedCompositingForOverflowScrollEnabled())
-            compositor()->setShouldReevaluateCompositingAfterLayout();
+            compositor()->setNeedsToRecomputeCompositingRequirements();
     }
 }
 
@@ -4546,7 +4532,7 @@
     if (!renderer()->documentBeingDestroyed()) {
         compositor()->setCompositingLayersNeedRebuild();
         if (acceleratedCompositingForOverflowScrollEnabled())
-            compositor()->setShouldReevaluateCompositingAfterLayout();
+            compositor()->setNeedsToRecomputeCompositingRequirements();
     }
 }
 
@@ -5271,6 +5257,17 @@
     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)