| 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 794a0bfd9952b4062de584613e020677dc8c6282..33ddc283395969bb46fd91a4be33d3073a4cc3e6 100644
|
| --- a/third_party/WebKit/Source/core/animation/Animation.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/Animation.cpp
|
| @@ -904,7 +904,7 @@ void Animation::endUpdatingState()
|
|
|
| void Animation::createCompositorPlayer()
|
| {
|
| - if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->isThreadedAnimationEnabled() && !m_compositorPlayer) {
|
| + if (Platform::current()->isThreadedAnimationEnabled() && !m_compositorPlayer) {
|
| ASSERT(Platform::current()->compositorSupport());
|
| m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
|
| ASSERT(m_compositorPlayer);
|
| @@ -946,7 +946,7 @@ void Animation::detachCompositorTimeline()
|
|
|
| void Animation::attachCompositedLayers()
|
| {
|
| - if (!RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() || !m_compositorPlayer)
|
| + if (!m_compositorPlayer)
|
| return;
|
|
|
| ASSERT(m_content);
|
| @@ -964,7 +964,6 @@ void Animation::detachCompositedLayers()
|
|
|
| void Animation::notifyAnimationStarted(double monotonicTime, int group)
|
| {
|
| - ASSERT(RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled());
|
| timeline()->document()->compositorPendingAnimations().notifyCompositorAnimationStarted(monotonicTime, group);
|
| }
|
|
|
|
|