| 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 5f013b185cfcb8dc0f99b02cb061c6541442a231..dcdb913ed6f3de401feb3c1694b0a6a6a8998cbf 100644
|
| --- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| +++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| @@ -43,10 +43,12 @@
|
| #include "core/plugins/PluginView.h"
|
| #include "platform/RuntimeEnabledFeatures.h"
|
| #include "platform/TraceEvent.h"
|
| +#include "platform/animation/CompositorAnimationTimeline.h"
|
| #include "platform/exported/WebScrollbarImpl.h"
|
| #include "platform/exported/WebScrollbarThemeGeometryNative.h"
|
| #include "platform/geometry/Region.h"
|
| #include "platform/geometry/TransformState.h"
|
| +#include "platform/graphics/CompositorFactory.h"
|
| #include "platform/graphics/GraphicsLayer.h"
|
| #if OS(MACOSX)
|
| #include "platform/mac/ScrollAnimatorMac.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"
|
| @@ -696,16 +697,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();
|
| }
|
| }
|
|
|