| Index: third_party/WebKit/Source/core/animation/AnimationTimeline.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp b/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp
|
| index 00f6c504a578216b5f31ba439923a0371837705e..5aa6570418da9947c2ea945e199f3edade10c342 100644
|
| --- a/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/AnimationTimeline.cpp
|
| @@ -36,10 +36,11 @@
|
| #include "core/frame/FrameView.h"
|
| #include "core/loader/DocumentLoader.h"
|
| #include "core/page/Page.h"
|
| +#include "platform/CompositorFactory.h"
|
| #include "platform/RuntimeEnabledFeatures.h"
|
| #include "platform/TraceEvent.h"
|
| +#include "platform/animation/CompositorAnimationTimeline.h"
|
| #include "public/platform/Platform.h"
|
| -#include "public/platform/WebCompositorAnimationTimeline.h"
|
| #include "public/platform/WebCompositorSupport.h"
|
| #include <algorithm>
|
|
|
| @@ -78,10 +79,8 @@ AnimationTimeline::AnimationTimeline(Document* document, PlatformTiming* timing)
|
| else
|
| m_timing = timing;
|
|
|
| - if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->isThreadedAnimationEnabled()) {
|
| - ASSERT(Platform::current()->compositorSupport());
|
| - m_compositorTimeline = adoptPtr(Platform::current()->compositorSupport()->createAnimationTimeline());
|
| - }
|
| + if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->isThreadedAnimationEnabled())
|
| + m_compositorTimeline = adoptPtr(CompositorFactory::current().createAnimationTimeline());
|
|
|
| ASSERT(document);
|
| }
|
|
|