Add a new document lifecycle; CompositingInputsClean

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 2908 matching lines @@
 // TODO(chrishtr): add a scrolling update lifecycle phase.
 void FrameView::UpdateLifecycleToCompositingCleanPlusScrolling() {
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     UpdateAllLifecyclePhasesExceptPaint();
   } else {
     GetFrame().LocalFrameRoot()->View()->UpdateLifecyclePhasesInternal(
         DocumentLifecycle::kCompositingClean);
   }
 }
 
+void FrameView::UpdateLifecycleToCompositingInputsClean() {
+  // When SPv2 is enabled, the standard compositing lifecycle steps do not
+  // exist; compositing is done after paint instead.
+  DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+  GetFrame().LocalFrameRoot()->View()->UpdateLifecyclePhasesInternal(
+      DocumentLifecycle::kCompositingInputsClean);
+}
+
 void FrameView::UpdateAllLifecyclePhasesExceptPaint() {
   GetFrame().LocalFrameRoot()->View()->UpdateLifecyclePhasesInternal(
       DocumentLifecycle::kPrePaintClean);
 }
 
 void FrameView::UpdateLifecycleToLayoutClean() {
   GetFrame().LocalFrameRoot()->View()->UpdateLifecyclePhasesInternal(
       DocumentLifecycle::kLayoutClean);
 }
 
@@ skipping 84 matching lines @@
     NOTREACHED() << "FrameView::updateLifecyclePhasesInternal() reentrance";
     return;
   }
 
   // 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.
   DCHECK(frame_->IsLocalRoot());
 
   // Only the following target states are supported.
   DCHECK(target_state == DocumentLifecycle::kLayoutClean ||
+         target_state == DocumentLifecycle::kCompositingInputsClean ||
          target_state == DocumentLifecycle::kCompositingClean ||
          target_state == DocumentLifecycle::kPrePaintClean ||
          target_state == DocumentLifecycle::kPaintClean);
 
   if (!frame_->GetDocument()->IsActive())
     return;
 
   AutoReset<DocumentLifecycle::LifecycleState> target_state_scope(
       &current_update_lifecycle_phases_target_state_, target_state);
 
@@ skipping 29 matching lines @@
     ForAllNonThrottledFrameViews([](FrameView& frame_view) {
       frame_view.CheckDoesNotNeedLayout();
       frame_view.allows_layout_invalidation_after_layout_clean_ = false;
     });
 
     {
       TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data",
                    InspectorUpdateLayerTreeEvent::Data(frame_.Get()));
 
       if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-        view.Compositor()->UpdateIfNeededRecursive();
+        view.Compositor()->UpdateIfNeededRecursive(target_state);
       } else {
         ForAllNonThrottledFrameViews([](FrameView& frame_view) {
           frame_view.GetLayoutView()->Layer()->UpdateDescendantDependentFlags();
           frame_view.GetLayoutView()->CommitPendingSelection();
         });
       }
 
+      if (target_state == DocumentLifecycle::kCompositingInputsClean) {
+        DCHECK_EQ(Lifecycle().GetState(),
+                  DocumentLifecycle::kCompositingInputsClean);
+        return;
+      }
+
       ScrollContentsIfNeededRecursive();
       DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() ||
              Lifecycle().GetState() >= DocumentLifecycle::kCompositingClean);
 
       frame_->GetPage()->GlobalRootScrollerController().DidUpdateCompositing();
 
       if (target_state >= DocumentLifecycle::kPrePaintClean) {
         if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
           InvalidateTreeIfNeededRecursive();
 
@@ skipping 2231 matching lines @@
 void FrameView::SetAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   animation_host_ = std::move(host);
 }
 
 LayoutUnit FrameView::CaretWidth() const {
   return LayoutUnit(GetHostWindow()->WindowToViewportScalar(1));
 }
 
 }  // namespace blink