Index: Source/core/inspector/InspectorDOMAgent.cpp |
diff --git a/Source/core/inspector/InspectorDOMAgent.cpp b/Source/core/inspector/InspectorDOMAgent.cpp |
index ca9a2ff73bb13e6e0161eb6fdc4113206161513f..23932fb1d122defa9c5602a31c0ce1217e0a6f3a 100644 |
--- a/Source/core/inspector/InspectorDOMAgent.cpp |
+++ b/Source/core/inspector/InspectorDOMAgent.cpp |
@@ -34,6 +34,9 @@ |
#include "bindings/core/v8/ExceptionState.h" |
#include "bindings/core/v8/ScriptEventListener.h" |
#include "core/InputTypeNames.h" |
+#include "core/animation/AnimationNode.h" |
+#include "core/animation/AnimationPlayer.h" |
+#include "core/animation/ElementAnimation.h" |
#include "core/dom/Attr.h" |
#include "core/dom/CharacterData.h" |
#include "core/dom/ContainerNode.h" |
@@ -440,6 +443,16 @@ Element* InspectorDOMAgent::assertElement(ErrorString* errorString, int nodeId) |
return toElement(node); |
} |
+AnimationPlayer* InspectorDOMAgent::assertAnimationPlayer(ErrorString* errorString, const String& id) |
+{ |
+ AnimationPlayer* player = m_idToAnimationPlayer.get(id); |
+ if (!player) { |
+ *errorString = "Could not find animation player with given id"; |
+ return 0; |
+ } |
+ return player; |
+} |
+ |
static ShadowRoot* userAgentShadowRoot(Node* node) |
{ |
if (!node || !node->isInShadowTree()) |
@@ -605,6 +618,7 @@ void InspectorDOMAgent::discardFrontendBindings() |
m_cachedChildCount.clear(); |
if (m_revalidateStyleAttrTask) |
m_revalidateStyleAttrTask->reset(); |
+ m_idToAnimationPlayer.clear(); |
} |
Node* InspectorDOMAgent::nodeForId(int id) |
@@ -1351,6 +1365,58 @@ void InspectorDOMAgent::highlightFrame( |
} |
} |
+void InspectorDOMAgent::getAnimationPlayersForNode(ErrorString* errorString, int nodeId, RefPtr<TypeBuilder::Array<TypeBuilder::DOM::AnimationPlayer> >& animationPlayersArray) |
+{ |
+ animationPlayersArray = TypeBuilder::Array<TypeBuilder::DOM::AnimationPlayer>::create(); |
+ Element* element = assertElement(errorString, nodeId); |
+ if (!element) |
+ return; |
+ m_idToAnimationPlayer.clear(); |
+ WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer> > players = ElementAnimation::getAnimationPlayers(*element); |
+ for (WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer> >::iterator it = players.begin(); it != players.end(); ++it) { |
+ AnimationPlayer& player = *(it->get()); |
+ m_idToAnimationPlayer.set(playerId(player), &player); |
+ RefPtr<TypeBuilder::DOM::AnimationPlayer> animationPlayerObject = buildObjectForAnimationPlayer(player); |
+ animationPlayersArray->addItem(animationPlayerObject); |
+ } |
+} |
+ |
+void InspectorDOMAgent::pauseAnimationPlayer(ErrorString* errorString, const String& id, RefPtr<TypeBuilder::DOM::AnimationPlayer>& animationPlayer) |
+{ |
+ AnimationPlayer* player = assertAnimationPlayer(errorString, id); |
+ if (!player) |
+ return; |
+ player->pause(); |
+ animationPlayer = buildObjectForAnimationPlayer(*player); |
+} |
+ |
+void InspectorDOMAgent::playAnimationPlayer(ErrorString* errorString, const String& id, RefPtr<TypeBuilder::DOM::AnimationPlayer>& animationPlayer) |
+{ |
+ AnimationPlayer* player = assertAnimationPlayer(errorString, id); |
+ if (!player) |
+ return; |
+ player->play(); |
+ animationPlayer = buildObjectForAnimationPlayer(*player); |
+} |
+ |
+void InspectorDOMAgent::setAnimationPlayerCurrentTime(ErrorString* errorString, const String& id, double currentTime, RefPtr<TypeBuilder::DOM::AnimationPlayer>& animationPlayer) |
+{ |
+ AnimationPlayer* player = assertAnimationPlayer(errorString, id); |
+ if (!player) |
+ return; |
+ player->setCurrentTime(currentTime); |
+ animationPlayer = buildObjectForAnimationPlayer(*player); |
+} |
+ |
+void InspectorDOMAgent::getAnimationPlayerState(ErrorString* errorString, const String& id, double* currentTime, bool* isRunning) |
+{ |
+ AnimationPlayer* player = assertAnimationPlayer(errorString, id); |
+ if (!player) |
+ return; |
+ *currentTime = player->currentTime(); |
+ *isRunning = player->playing(); |
+} |
+ |
void InspectorDOMAgent::hideHighlight(ErrorString*) |
{ |
m_overlay->hideHighlight(); |
@@ -1768,6 +1834,34 @@ PassRefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > InspectorDOMAgent::build |
return pseudoElements.release(); |
} |
+PassRefPtr<TypeBuilder::DOM::AnimationPlayer> InspectorDOMAgent::buildObjectForAnimationPlayer(AnimationPlayer& animationPlayer) |
+{ |
+ RefPtr<TypeBuilder::DOM::AnimationPlayer> playerObject = TypeBuilder::DOM::AnimationPlayer::create() |
+ .setId(playerId(animationPlayer)) |
+ .setPaused(animationPlayer.paused()) |
+ .setFinished(animationPlayer.finished()) |
+ .setPlaybackRate(animationPlayer.playbackRate()) |
+ .setStartTime(animationPlayer.startTime()) |
+ .setCurrentTime(animationPlayer.currentTime()) |
+ .setAnimation(buildObjectForAnimationNode(*(animationPlayer.source()))); |
+ return playerObject.release(); |
+} |
+ |
+PassRefPtr<TypeBuilder::DOM::AnimationNode> InspectorDOMAgent::buildObjectForAnimationNode(AnimationNode& animationNode) |
+{ |
+ RefPtr<TypeBuilder::DOM::AnimationNode> animationObject = TypeBuilder::DOM::AnimationNode::create() |
+ .setStartDelay(animationNode.specifiedTiming().startDelay) |
+ .setPlaybackRate(animationNode.specifiedTiming().playbackRate) |
+ .setIterationStart(animationNode.specifiedTiming().iterationStart) |
+ .setIterationCount(animationNode.specifiedTiming().iterationCount) |
+ .setDuration(animationNode.duration()) |
+ .setDirection(animationNode.specifiedTiming().direction) |
+ .setFillMode(animationNode.specifiedTiming().fillMode) |
+ .setTimeFraction(animationNode.timeFraction()) |
+ .setName(animationNode.name()); |
+ return animationObject.release(); |
+} |
+ |
Node* InspectorDOMAgent::innerFirstChild(Node* node) |
{ |
node = node->firstChild(); |
@@ -2195,6 +2289,7 @@ void InspectorDOMAgent::trace(Visitor* visitor) |
visitor->trace(m_document); |
visitor->trace(m_revalidateStyleAttrTask); |
visitor->trace(m_searchResults); |
+ visitor->trace(m_idToAnimationPlayer); |
#endif |
visitor->trace(m_history); |
visitor->trace(m_domEditor); |