Support compositing for active animations in 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 2855 matching lines @@
       frameView.m_allowsLayoutInvalidationAfterLayoutClean = false;
     });
 
     {
       TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data",
                    InspectorUpdateLayerTreeEvent::data(m_frame.get()));
 
       if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
         view.compositor()->updateIfNeededRecursive();
       } else {
-        DocumentAnimations::updateAnimations(layoutView()->document());
-
         forAllNonThrottledFrameViews([](FrameView& frameView) {
           frameView.layoutView()->layer()->updateDescendantDependentFlags();
           frameView.layoutView()->commitPendingSelection();
         });
       }
 
       scrollContentsIfNeededRecursive();
       DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() ||
              lifecycle().state() >= DocumentLifecycle::CompositingClean);
 
       m_frame->host()->globalRootScrollerController().didUpdateCompositing();
 
       if (targetState >= DocumentLifecycle::PrePaintClean) {
         if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
           invalidateTreeIfNeededRecursive();
 
         if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
           if (view.compositor()->inCompositingMode())
             scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
         }
 
         updateCompositedSelectionIfNeeded();
       }
     }
 
     if (targetState >= DocumentLifecycle::PrePaintClean) {
       updatePaintProperties();
     }
 
+    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())

[wkorman, 2016/12/15 23:06:00]

Will remove before landing, this is manual patch of
https://codereview.chromium.org/2570723002

+      DocumentAnimations::updateAnimations(layoutView()->document());
+
     if (targetState == DocumentLifecycle::PaintClean) {
       if (!m_frame->document()->printing())
         synchronizedPaint();
 
       if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         pushPaintArtifactToCompositor();
 
       DCHECK(!view.hasPendingSelection());
       DCHECK((m_frame->document()->printing() &&
               lifecycle().state() == DocumentLifecycle::PrePaintClean) ||
@@ skipping 1757 matching lines @@
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.width();
 }
 
 int FrameView::initialViewportHeight() const {
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.height();
 }
 
 }  // namespace blink