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

Side by Side Diff: Source/core/inspector/InspectorAnimationAgent.cpp

Issue 980053006: Revert of Devtools Animations: Represent delay and end-delay on the animation timeline (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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
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 6
7 #include "core/inspector/InspectorAnimationAgent.h" 7 #include "core/inspector/InspectorAnimationAgent.h"
8 8
9 #include "core/animation/Animation.h" 9 #include "core/animation/Animation.h"
10 #include "core/animation/AnimationEffect.h" 10 #include "core/animation/AnimationEffect.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 delay = keyframes.at(1)->offset() * duration; 87 delay = keyframes.at(1)->offset() * duration;
88 duration -= delay; 88 duration -= delay;
89 easing = keyframes.at(1)->easing().toString(); 89 easing = keyframes.at(1)->easing().toString();
90 } else { 90 } else {
91 easing = keyframes.at(0)->easing().toString(); 91 easing = keyframes.at(0)->easing().toString();
92 } 92 }
93 } 93 }
94 94
95 RefPtr<TypeBuilder::Animation::AnimationNode> animationObject = TypeBuilder: :Animation::AnimationNode::create() 95 RefPtr<TypeBuilder::Animation::AnimationNode> animationObject = TypeBuilder: :Animation::AnimationNode::create()
96 .setDelay(delay) 96 .setDelay(delay)
97 .setEndDelay(computedTiming.endDelay())
98 .setPlaybackRate(computedTiming.playbackRate()) 97 .setPlaybackRate(computedTiming.playbackRate())
99 .setIterationStart(computedTiming.iterationStart()) 98 .setIterationStart(computedTiming.iterationStart())
100 .setIterations(computedTiming.iterations()) 99 .setIterations(computedTiming.iterations())
101 .setDuration(duration) 100 .setDuration(duration)
102 .setDirection(computedTiming.direction()) 101 .setDirection(computedTiming.direction())
103 .setFill(computedTiming.fill()) 102 .setFill(computedTiming.fill())
104 .setName(animation->name()) 103 .setName(animation->name())
105 .setBackendNodeId(InspectorNodeIds::idForNode(animation->target())) 104 .setBackendNodeId(InspectorNodeIds::idForNode(animation->target()))
106 .setEasing(easing); 105 .setEasing(easing);
107 return animationObject.release(); 106 return animationObject.release();
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 { 290 {
292 #if ENABLE(OILPAN) 291 #if ENABLE(OILPAN)
293 visitor->trace(m_pageAgent); 292 visitor->trace(m_pageAgent);
294 visitor->trace(m_domAgent); 293 visitor->trace(m_domAgent);
295 visitor->trace(m_idToAnimationPlayer); 294 visitor->trace(m_idToAnimationPlayer);
296 #endif 295 #endif
297 InspectorBaseAgent::trace(visitor); 296 InspectorBaseAgent::trace(visitor);
298 } 297 }
299 298
300 } 299 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698