1 files changed, 7 insertions, 4 deletions
diff --git a/chromium/third_party/blink/renderer/core/page/page_animator.cc b/chromium/third_party/blink/renderer/core/page/page_animator.cc
index 818f208449d..8d5ad84758a 100644
--- a/chromium/third_party/blink/renderer/core/page/page_animator.cc
+++ b/chromium/third_party/blink/renderer/core/page/page_animator.cc
@@ -10,6 +10,7 @@
 #include "third_party/blink/renderer/core/frame/local_frame_view.h"
 #include "third_party/blink/renderer/core/page/chrome_client.h"
 #include "third_party/blink/renderer/core/page/page.h"
+#include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h"
 #include "third_party/blink/renderer/core/svg/svg_document_extensions.h"
 #include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h"
 
@@ -61,15 +62,17 @@ void PageAnimator::ServiceScriptedAnimations(
               document->View()->AnimatingScrollableAreas()) {
         // Iterate over a copy, since ScrollableAreas may deregister
         // themselves during the iteration.
-        HeapVector<Member<ScrollableArea>> animating_scrollable_areas_copy;
+        HeapVector<Member<PaintLayerScrollableArea>>
+            animating_scrollable_areas_copy;
         CopyToVector(*animating_scrollable_areas,
                      animating_scrollable_areas_copy);
-        for (ScrollableArea* scrollable_area :
+        for (PaintLayerScrollableArea* scrollable_area :
              animating_scrollable_areas_copy) {
           scrollable_area->ServiceScrollAnimations(
               monotonic_animation_start_time.since_origin().InSecondsF());
         }
       }
+      document->GetFrame()->AnimateSnapFling(monotonic_animation_start_time);
       SVGDocumentExtensions::ServiceOnAnimationFrame(*document);
     }
     // TODO(skyostil): This function should not run for documents without views.
@@ -104,11 +107,11 @@ void PageAnimator::UpdateAllLifecyclePhases(LocalFrame& root_frame) {
   view->UpdateAllLifecyclePhases();
 }
 
-void PageAnimator::UpdateLifecycleToPrePaintClean(LocalFrame& root_frame) {
+void PageAnimator::UpdateAllLifecyclePhasesExceptPaint(LocalFrame& root_frame) {
   LocalFrameView* view = root_frame.View();
   base::AutoReset<bool> servicing(&updating_layout_and_style_for_painting_,
                                   true);
-  view->UpdateLifecycleToPrePaintClean();
+  view->UpdateAllLifecyclePhasesExceptPaint();
 }
 
 }  // namespace blink