Index: Source/core/animation/AnimationPlayer.cpp |
diff --git a/Source/core/animation/AnimationPlayer.cpp b/Source/core/animation/AnimationPlayer.cpp |
index 30c585ede03a36c0ed1fe710c3e0f3d292e717ae..053481471d6d0dd4e8eeeb3d3ce9b773a125103d 100644 |
--- a/Source/core/animation/AnimationPlayer.cpp |
+++ b/Source/core/animation/AnimationPlayer.cpp |
@@ -39,7 +39,11 @@ |
#include "core/frame/UseCounter.h" |
#include "core/inspector/InspectorInstrumentation.h" |
#include "core/inspector/InspectorTraceEvents.h" |
+#include "platform/RuntimeEnabledFeatures.h" |
#include "platform/TraceEvent.h" |
+#include "public/platform/Platform.h" |
+#include "public/platform/WebCompositorAnimationPlayer.h" |
+#include "public/platform/WebCompositorSupport.h" |
#include "wtf/MathExtras.h" |
namespace blink { |
@@ -66,6 +70,7 @@ PassRefPtrWillBeRawPtr<AnimationPlayer> AnimationPlayer::create(AnimationNode* s |
if (timeline) { |
timeline->playerAttached(*player); |
+ player->attachCompositorTimeline(); |
} |
return player.release(); |
@@ -108,6 +113,9 @@ AnimationPlayer::~AnimationPlayer() |
if (m_timeline) |
m_timeline->playerDestroyed(this); |
#endif |
+ |
+ detachCompositedLayers(); |
+ destroyCompositorPlayer(); |
} |
double AnimationPlayer::sourceEnd() const |
@@ -266,6 +274,11 @@ void AnimationPlayer::preCommit(int compositorGroup, bool startOnCompositor) |
if (shouldStart) { |
m_compositorGroup = compositorGroup; |
if (startOnCompositor) { |
+ if (isCandidateForAnimationOnCompositor()) { |
+ createCompositorPlayer(); |
dstockwell
2015/03/31 02:13:01
It now seems like createCompositorPlayer/attachCom
loyso (OOO)
2015/03/31 02:30:27
Not always. AnimationPlayer::setSource uses attach
loyso (OOO)
2015/04/01 00:14:26
Done.
|
+ attachCompositedLayers(); |
+ } |
+ |
if (maybeStartAnimationOnCompositor()) |
m_compositorState = adoptPtr(new CompositorState(*this)); |
else |
@@ -428,8 +441,10 @@ void AnimationPlayer::setSource(AnimationNode* newSource) |
PlayStateUpdateScope updateScope(*this, TimingUpdateOnDemand, SetCompositorPendingWithSourceChanged); |
double storedCurrentTime = currentTimeInternal(); |
- if (m_content) |
+ if (m_content) { |
+ detachCompositedLayers(); |
m_content->detach(); |
+ } |
m_content = newSource; |
if (newSource) { |
// FIXME: This logic needs to be updated once groups are implemented |
@@ -438,6 +453,7 @@ void AnimationPlayer::setSource(AnimationNode* newSource) |
newSource->player()->setSource(0); |
} |
newSource->attach(this); |
+ attachCompositedLayers(); |
dstockwell
2015/03/31 02:13:01
Shouldn't this be removed in favor of the call in
loyso (OOO)
2015/03/31 02:30:27
It's related to the comment above. Don't we call s
dstockwell
2015/03/31 03:27:32
Yes, but it can be called at any time, including b
loyso (OOO)
2015/03/31 04:43:31
Done.
|
setOutdated(); |
} |
setCurrentTimeInternal(storedCurrentTime, TimingUpdateOnDemand); |
@@ -665,7 +681,7 @@ void AnimationPlayer::setOutdated() |
m_timeline->setOutdatedAnimationPlayer(this); |
} |
-bool AnimationPlayer::canStartAnimationOnCompositor() |
+bool AnimationPlayer::canStartAnimationOnCompositor() const |
{ |
// FIXME: Timeline playback rates should be compositable |
if (m_playbackRate == 0 || (std::isinf(sourceEnd()) && m_playbackRate < 0) || (timeline() && timeline()->playbackRate() != 1)) |
@@ -674,6 +690,14 @@ bool AnimationPlayer::canStartAnimationOnCompositor() |
return m_timeline && m_content && m_content->isAnimation() && playing(); |
} |
+bool AnimationPlayer::isCandidateForAnimationOnCompositor() const |
+{ |
+ if (!canStartAnimationOnCompositor()) |
+ return false; |
+ |
+ return toAnimation(m_content.get())->isCandidateForAnimationOnCompositor(m_playbackRate); |
+} |
+ |
bool AnimationPlayer::maybeStartAnimationOnCompositor() |
{ |
if (!canStartAnimationOnCompositor()) |
@@ -699,6 +723,8 @@ void AnimationPlayer::setCompositorPending(bool sourceChanged) |
{ |
// FIXME: Animation could notify this directly? |
if (!hasActiveAnimationsOnCompositor()) { |
+ detachCompositedLayers(); |
+ destroyCompositorPlayer(); |
m_compositorState.release(); |
} |
if (sourceChanged && m_compositorState) { |
@@ -720,6 +746,9 @@ void AnimationPlayer::cancelAnimationOnCompositor() |
{ |
if (hasActiveAnimationsOnCompositor()) |
toAnimation(m_content.get())->cancelAnimationOnCompositor(); |
+ |
+ detachCompositedLayers(); |
+ destroyCompositorPlayer(); |
} |
void AnimationPlayer::restartAnimationOnCompositor() |
@@ -822,6 +851,67 @@ void AnimationPlayer::endUpdatingState() |
m_stateIsBeingUpdated = false; |
} |
+void AnimationPlayer::createCompositorPlayer() |
+{ |
+ if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && !m_compositorPlayer && Platform::current()->compositorSupport()) { |
+ m_compositorPlayer = adoptPtr(Platform::current()->compositorSupport()->createAnimationPlayer()); |
+ ASSERT(m_compositorPlayer); |
+ m_compositorPlayer->setAnimationDelegate(this); |
+ attachCompositorTimeline(); |
+ } |
+} |
+ |
+void AnimationPlayer::destroyCompositorPlayer() |
+{ |
+ if (m_compositorPlayer) { |
+ detachCompositorTimeline(); |
+ m_compositorPlayer->setAnimationDelegate(nullptr); |
+ } |
+ m_compositorPlayer.clear(); |
+} |
+ |
+void AnimationPlayer::attachCompositorTimeline() |
+{ |
+ if (m_compositorPlayer) { |
+ WebCompositorAnimationTimeline* timeline = m_timeline ? m_timeline->compositorTimeline() : nullptr; |
+ if (timeline) |
+ timeline->playerAttached(*this); |
+ } |
+} |
+ |
+void AnimationPlayer::detachCompositorTimeline() |
+{ |
+ if (m_compositorPlayer) { |
+ WebCompositorAnimationTimeline* timeline = m_timeline ? m_timeline->compositorTimeline() : nullptr; |
+ if (timeline) |
+ timeline->playerDestroyed(*this); |
+ } |
+} |
+ |
+void AnimationPlayer::attachCompositedLayers() |
+{ |
+ if (!RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() || !m_compositorPlayer) |
+ return; |
+ |
+ ASSERT(m_content); |
+ ASSERT(m_content->isAnimation()); |
+ ASSERT(toAnimation(m_content.get())->canAttachCompositedLayers()); |
+ |
+ toAnimation(m_content.get())->attachCompositedLayers(); |
+} |
+ |
+void AnimationPlayer::detachCompositedLayers() |
+{ |
+ if (m_compositorPlayer && m_compositorPlayer->isLayerAttached()) |
+ m_compositorPlayer->detachLayer(); |
+} |
+ |
+void AnimationPlayer::notifyAnimationStarted(double monotonicTime, int group) |
+{ |
+ ASSERT(RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()); |
+ timeline()->document()->compositorPendingAnimations().notifyCompositorAnimationStarted(monotonicTime, group); |
+} |
+ |
AnimationPlayer::PlayStateUpdateScope::PlayStateUpdateScope(AnimationPlayer& player, TimingUpdateReason reason, CompositorPendingChange compositorPendingChange) |
: m_player(player) |
, m_initialPlayState(m_player->playStateInternal()) |