Compositor Animation Timelines: Fix frame swapping tests in WebFrameTest.cpp

third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

Index: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
index 21d917202486441d4f508ecff067c2ceac658fa5..80172f10c57ff5b2a5cf2822b524f33841227ff5 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -94,7 +94,6 @@ ScrollingCoordinator::ScrollingCoordinator(Page* page)
     , m_wasFrameScrollable(false)
     , m_lastMainThreadScrollingReasons(0)
 {
-    createProgrammaticScrollAnimatorTimeline();
 }
 
 ScrollingCoordinator::~ScrollingCoordinator()
@@ -720,6 +719,16 @@ void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(MainTh
     }
 }
 
+void ScrollingCoordinator::onSetMainFrame()
+{
+    createProgrammaticScrollAnimatorTimeline();

[dcheng, 2015/11/19 05:09:56]

It feels like this should be tied to initializing the layer tree view, perhaps?

[loyso (OOO), 2015/11/26 06:22:52]

Done.

+}
+
+void ScrollingCoordinator::willSwapMainFrame()
+{
+    destroyProgrammaticScrollAnimatorTimeline();
+}
+
 void ScrollingCoordinator::willCloseLayerTreeView()
 {
     destroyProgrammaticScrollAnimatorTimeline();