Add a FrameView lifecycle method that just updates layout, style and compositing.

Source/core/frame/FrameView.cpp

Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 79009f972ba2f911f6ad9fab63c014e3bc887fee..a978f7d8b2f19dfb7dff8cd308a6c4207da2b211 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -2483,12 +2483,24 @@ void FrameView::updateWidgetPositionsIfNeeded()
     updateWidgetPositions();
 }
 
-void FrameView::updateLayoutAndStyleForPainting()
+void FrameView::updateAllLifecyclePhases()
 {
-    frame().localFrameRoot()->view()->updateLayoutAndStyleForPaintingInternal();
+    frame().localFrameRoot()->view()->updateAllLifecyclePhasesInternal();
 }
 
-void FrameView::updateLayoutAndStyleForPaintingInternal()
+// TODO(chrishtr): add a scrolling update lifecycle phase, after compositing and before invalidation.
+void FrameView::updateLifecycleToCompositingCleanPlusScrolling()
+{
+    frame().localFrameRoot()->view()->updateStyleAndLayoutIfNeededRecursive();
+    LayoutView* view = layoutView();
+    if (view)
+        view->compositor()->updateIfNeededRecursive();
+    scrollContentsIfNeededRecursive();
+
+    ASSERT(lifecycle().state() >= DocumentLifecycle::CompositingClean);
+}
+
+void FrameView::updateAllLifecyclePhasesInternal()
 {
     // This must be called from the root frame, since it recurses down, not up. Otherwise the lifecycles of the frames might be out of sync.
     ASSERT(frame() == page()->mainFrame() || (!frame().tree().parent()->isLocalFrame()));
@@ -2496,25 +2508,16 @@ void FrameView::updateLayoutAndStyleForPaintingInternal()
     // Updating layout can run script, which can tear down the FrameView.
     RefPtrWillBeRawPtr<FrameView> protector(this);
 
-    updateLayoutAndStyleIfNeededRecursive();
+    updateStyleAndLayoutIfNeededRecursive();
 
     LayoutView* view = layoutView();
     if (view) {
         TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data", InspectorUpdateLayerTreeEvent::data(m_frame.get()));
 
         view->compositor()->updateIfNeededRecursive();
-
-        if (view->compositor()->inCompositingMode() && m_frame->isLocalRoot())
-            scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
-
-        updateCompositedSelectionIfNeeded();
-
-        if (RuntimeEnabledFeatures::frameTimingSupportEnabled())
-            updateFrameTimingRequestsIfNeeded();
-
         scrollContentsIfNeededRecursive();
-
         invalidateTreeIfNeededRecursive();
+        updatePostLifecycleData();
 
         ASSERT(!view->hasPendingSelection());
     }
@@ -2522,6 +2525,19 @@ void FrameView::updateLayoutAndStyleForPaintingInternal()
     ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
 }
 
+void FrameView::updatePostLifecycleData()
+{
+    LayoutView* view = layoutView();
+    ASSERT(view);
+
+    if (view->compositor()->inCompositingMode() && m_frame->isLocalRoot())
+        scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
+
+    updateCompositedSelectionIfNeeded();
+    if (RuntimeEnabledFeatures::frameTimingSupportEnabled())
+        updateFrameTimingRequestsIfNeeded();
+}
+
 void FrameView::updateFrameTimingRequestsIfNeeded()
 {
     GraphicsLayerFrameTimingRequests graphicsLayerTimingRequests;
@@ -2534,7 +2550,7 @@ void FrameView::updateFrameTimingRequestsIfNeeded()
     }
 }
 
-void FrameView::updateLayoutAndStyleIfNeededRecursive()
+void FrameView::updateStyleAndLayoutIfNeededRecursive()
 {
     // We have to crawl our entire subtree looking for any FrameViews that need
     // layout and make sure they are up to date.
@@ -2561,7 +2577,7 @@ void FrameView::updateLayoutAndStyleIfNeededRecursive()
     }
 
     for (const auto& frameView : frameViews)
-        frameView->updateLayoutAndStyleIfNeededRecursive();
+        frameView->updateStyleAndLayoutIfNeededRecursive();
 
     // When an <iframe> gets composited, it triggers an extra style recalc in its containing FrameView.
     // To avoid pushing an invalid tree for display, we have to check for this case and do another