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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/InspectorTraceEvents.h ('k') | Source/core/style/KeyframeList.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/inspector/InspectorTraceEvents.h" 6 #include "core/inspector/InspectorTraceEvents.h"
7 7
8 #include "bindings/core/v8/ScriptCallStackFactory.h" 8 #include "bindings/core/v8/ScriptCallStackFactory.h"
9 #include "bindings/core/v8/ScriptSourceCode.h" 9 #include "bindings/core/v8/ScriptSourceCode.h"
10 #include "core/animation/Animation.h" 10 #include "core/animation/Animation.h"
11 #include "core/animation/AnimationPlayer.h" 11 #include "core/animation/KeyframeEffect.h"
12 #include "core/css/invalidation/DescendantInvalidationSet.h" 12 #include "core/css/invalidation/DescendantInvalidationSet.h"
13 #include "core/dom/DOMNodeIds.h" 13 #include "core/dom/DOMNodeIds.h"
14 #include "core/dom/StyleChangeReason.h" 14 #include "core/dom/StyleChangeReason.h"
15 #include "core/events/Event.h" 15 #include "core/events/Event.h"
16 #include "core/fetch/CSSStyleSheetResource.h" 16 #include "core/fetch/CSSStyleSheetResource.h"
17 #include "core/frame/FrameView.h" 17 #include "core/frame/FrameView.h"
18 #include "core/frame/LocalFrame.h" 18 #include "core/frame/LocalFrame.h"
19 #include "core/inspector/IdentifiersFactory.h" 19 #include "core/inspector/IdentifiersFactory.h"
20 #include "core/inspector/ScriptCallStack.h" 20 #include "core/inspector/ScriptCallStack.h"
21 #include "core/layout/LayoutImage.h" 21 #include "core/layout/LayoutImage.h"
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 } 749 }
750 750
751 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorSetLayerTreeId::data(c onst String& sessionId, int layerTreeId) 751 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorSetLayerTreeId::data(c onst String& sessionId, int layerTreeId)
752 { 752 {
753 RefPtr<TracedValue> value = TracedValue::create(); 753 RefPtr<TracedValue> value = TracedValue::create();
754 value->setString("sessionId", sessionId); 754 value->setString("sessionId", sessionId);
755 value->setInteger("layerTreeId", layerTreeId); 755 value->setInteger("layerTreeId", layerTreeId);
756 return value.release(); 756 return value.release();
757 } 757 }
758 758
759 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationEvent::data(c onst AnimationPlayer& player) 759 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationEvent::data(c onst Animation& player)
760 { 760 {
761 RefPtr<TracedValue> value = TracedValue::create(); 761 RefPtr<TracedValue> value = TracedValue::create();
762 value->setString("id", String::number(player.sequenceNumber())); 762 value->setString("id", String::number(player.sequenceNumber()));
763 value->setString("state", player.playState()); 763 value->setString("state", player.playState());
764 if (const AnimationNode* source = player.source()) { 764 if (const AnimationEffect* source = player.source()) {
765 value->setString("name", source->name()); 765 value->setString("name", source->name());
766 if (source->isAnimation()) { 766 if (source->isAnimation()) {
767 if (Element* target = toAnimation(source)->target()) 767 if (Element* target = toKeyframeEffect(source)->target())
768 setNodeInfo(value.get(), target, "nodeId", "nodeName"); 768 setNodeInfo(value.get(), target, "nodeId", "nodeName");
769 } 769 }
770 } 770 }
771 return value.release(); 771 return value.release();
772 } 772 }
773 773
774 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationStateEvent::d ata(const AnimationPlayer& player) 774 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationStateEvent::d ata(const Animation& player)
775 { 775 {
776 RefPtr<TracedValue> value = TracedValue::create(); 776 RefPtr<TracedValue> value = TracedValue::create();
777 value->setString("state", player.playState()); 777 value->setString("state", player.playState());
778 return value.release(); 778 return value.release();
779 } 779 }
780 780
781 } 781 }
OLDNEW
« 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