Move animation update to follow paint phase for SPv2.

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 3040 matching lines @@
         }
         updateCompositedSelectionIfNeeded();
       }
 
       // TODO(pdr): prePaint should be under the "Paint" devtools timeline step
       // for slimming paint v2.
       if (targetState >= DocumentLifecycle::PrePaintClean)
         prePaint();
     }
 
-    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
-      DocumentAnimations::updateAnimations(layoutView()->document());
-
     if (targetState == DocumentLifecycle::PaintClean) {
       if (!m_frame->document()->printing() ||
           RuntimeEnabledFeatures::printBrowserEnabled())
         paintTree();
 
       if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         pushPaintArtifactToCompositor();
 
       DCHECK(!view.hasPendingSelection());
       DCHECK((m_frame->document()->printing() &&
               lifecycle().state() == DocumentLifecycle::PrePaintClean) ||
              lifecycle().state() == DocumentLifecycle::PaintClean);
+
+      if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+        DocumentAnimations::updateAnimations(layoutView()->document(),
+                                             DocumentLifecycle::PaintClean);
+      }
     }
 
     forAllNonThrottledFrameViews([](FrameView& frameView) {
       frameView.checkDoesNotNeedLayout();
       frameView.m_allowsLayoutInvalidationAfterLayoutClean = true;
     });
   }
 
   updateViewportIntersectionsForSubtree(targetState);
 }
@@ skipping 2105 matching lines @@
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
 }  // namespace blink