Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(946)

Unified Diff: Source/core/inspector/InspectorTraceEvents.cpp

Issue 1113173003: Web Animations: Update naming to reflect spec changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: No, really. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InspectorTraceEvents.h ('k') | Source/core/style/KeyframeList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorTraceEvents.cpp
diff --git a/Source/core/inspector/InspectorTraceEvents.cpp b/Source/core/inspector/InspectorTraceEvents.cpp
index 6aaf2d2a8028b88a852e7569d3403c097df2c2a2..59792d8a86617cde883be49adee8ebf9cac37489 100644
--- a/Source/core/inspector/InspectorTraceEvents.cpp
+++ b/Source/core/inspector/InspectorTraceEvents.cpp
@@ -8,7 +8,7 @@
#include "bindings/core/v8/ScriptCallStackFactory.h"
#include "bindings/core/v8/ScriptSourceCode.h"
#include "core/animation/Animation.h"
-#include "core/animation/AnimationPlayer.h"
+#include "core/animation/KeyframeEffect.h"
#include "core/css/invalidation/DescendantInvalidationSet.h"
#include "core/dom/DOMNodeIds.h"
#include "core/dom/StyleChangeReason.h"
@@ -756,22 +756,22 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorSetLayerTreeId::data(c
return value.release();
}
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationEvent::data(const AnimationPlayer& player)
+PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationEvent::data(const Animation& player)
{
RefPtr<TracedValue> value = TracedValue::create();
value->setString("id", String::number(player.sequenceNumber()));
value->setString("state", player.playState());
- if (const AnimationNode* source = player.source()) {
+ if (const AnimationEffect* source = player.source()) {
value->setString("name", source->name());
if (source->isAnimation()) {
- if (Element* target = toAnimation(source)->target())
+ if (Element* target = toKeyframeEffect(source)->target())
setNodeInfo(value.get(), target, "nodeId", "nodeName");
}
}
return value.release();
}
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationStateEvent::data(const AnimationPlayer& player)
+PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationStateEvent::data(const Animation& player)
{
RefPtr<TracedValue> value = TracedValue::create();
value->setString("state", player.playState());
« no previous file with comments | « Source/core/inspector/InspectorTraceEvents.h ('k') | Source/core/style/KeyframeList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698