| Index: third_party/WebKit/Source/core/animation/Animation.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/Animation.cpp b/third_party/WebKit/Source/core/animation/Animation.cpp
|
| index fe128ab5681b93f8fc0b986307c055b02a18661b..f1f56c0aac0da35707f831d35b7faea321d0a20e 100644
|
| --- a/third_party/WebKit/Source/core/animation/Animation.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/Animation.cpp
|
| @@ -38,10 +38,11 @@
|
| #include "core/frame/UseCounter.h"
|
| #include "core/inspector/InspectorInstrumentation.h"
|
| #include "core/inspector/InspectorTraceEvents.h"
|
| +#include "platform/CompositorFactory.h"
|
| #include "platform/RuntimeEnabledFeatures.h"
|
| #include "platform/TraceEvent.h"
|
| +#include "platform/animation/CompositorAnimationPlayer.h"
|
| #include "public/platform/Platform.h"
|
| -#include "public/platform/WebCompositorAnimationPlayer.h"
|
| #include "public/platform/WebCompositorSupport.h"
|
| #include "wtf/MathExtras.h"
|
|
|
| @@ -921,7 +922,7 @@ void Animation::createCompositorPlayer()
|
| {
|
| if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->isThreadedAnimationEnabled() && !m_compositorPlayer) {
|
| ASSERT(Platform::current()->compositorSupport());
|
| - m_compositorPlayer = adoptPtr(Platform::current()->compositorSupport()->createAnimationPlayer());
|
| + m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
|
| ASSERT(m_compositorPlayer);
|
| m_compositorPlayer->setAnimationDelegate(this);
|
| attachCompositorTimeline();
|
| @@ -944,7 +945,7 @@ void Animation::destroyCompositorPlayer()
|
| void Animation::attachCompositorTimeline()
|
| {
|
| if (m_compositorPlayer) {
|
| - WebCompositorAnimationTimeline* timeline = m_timeline ? m_timeline->compositorTimeline() : nullptr;
|
| + CompositorAnimationTimeline* timeline = m_timeline ? m_timeline->compositorTimeline() : nullptr;
|
| if (timeline)
|
| timeline->playerAttached(*this);
|
| }
|
| @@ -953,7 +954,7 @@ void Animation::attachCompositorTimeline()
|
| void Animation::detachCompositorTimeline()
|
| {
|
| if (m_compositorPlayer) {
|
| - WebCompositorAnimationTimeline* timeline = m_timeline ? m_timeline->compositorTimeline() : nullptr;
|
| + CompositorAnimationTimeline* timeline = m_timeline ? m_timeline->compositorTimeline() : nullptr;
|
| if (timeline)
|
| timeline->playerDestroyed(*this);
|
| }
|
|
|