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 84744848cfe370946fd1b638d8113ee47e8be747..a6f5c676c269647d17e26c9a2ba43ffb83b2051d 100644 |
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp |
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp |
@@ -41,8 +41,10 @@ |
#include "core/page/ChromeClient.h" |
#include "core/page/Page.h" |
#include "core/plugins/PluginView.h" |
+#include "platform/CompositorFactory.h" |
#include "platform/RuntimeEnabledFeatures.h" |
#include "platform/TraceEvent.h" |
+#include "platform/animation/WebCompositorAnimationTimeline.h" |
#include "platform/exported/WebScrollbarImpl.h" |
#include "platform/exported/WebScrollbarThemeGeometryNative.h" |
#include "platform/geometry/Region.h" |
@@ -55,7 +57,6 @@ |
#include "platform/scroll/ScrollAnimatorBase.h" |
#include "platform/scroll/ScrollbarTheme.h" |
#include "public/platform/Platform.h" |
-#include "public/platform/WebCompositorAnimationTimeline.h" |
#include "public/platform/WebCompositorSupport.h" |
#include "public/platform/WebLayerPositionConstraint.h" |
#include "public/platform/WebLayerTreeView.h" |
@@ -725,16 +726,15 @@ void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(MainTh |
void ScrollingCoordinator::layerTreeViewInitialized(WebLayerTreeView& layerTreeView) |
{ |
if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->isThreadedAnimationEnabled()) { |
- ASSERT(Platform::current()->compositorSupport()); |
- m_programmaticScrollAnimatorTimeline = adoptPtr(Platform::current()->compositorSupport()->createAnimationTimeline()); |
- layerTreeView.attachCompositorAnimationTimeline(m_programmaticScrollAnimatorTimeline.get()); |
+ m_programmaticScrollAnimatorTimeline = adoptPtr(CompositorFactory::current().createAnimationTimeline()); |
+ layerTreeView.attachCompositorAnimationTimeline(m_programmaticScrollAnimatorTimeline->animationTimeline()); |
} |
} |
void ScrollingCoordinator::willCloseLayerTreeView(WebLayerTreeView& layerTreeView) |
{ |
if (m_programmaticScrollAnimatorTimeline) { |
- layerTreeView.detachCompositorAnimationTimeline(m_programmaticScrollAnimatorTimeline.get()); |
+ layerTreeView.detachCompositorAnimationTimeline(m_programmaticScrollAnimatorTimeline->animationTimeline()); |
m_programmaticScrollAnimatorTimeline.clear(); |
} |
} |