OLD | NEW |
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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 delay = keyframes.at(1)->offset() * duration; | 88 delay = keyframes.at(1)->offset() * duration; |
89 duration -= delay; | 89 duration -= delay; |
90 easing = keyframes.at(1)->easing().toString(); | 90 easing = keyframes.at(1)->easing().toString(); |
91 } else { | 91 } else { |
92 easing = keyframes.at(0)->easing().toString(); | 92 easing = keyframes.at(0)->easing().toString(); |
93 } | 93 } |
94 } | 94 } |
95 | 95 |
96 RefPtr<TypeBuilder::Animation::AnimationNode> animationObject = TypeBuilder:
:Animation::AnimationNode::create() | 96 RefPtr<TypeBuilder::Animation::AnimationNode> animationObject = TypeBuilder:
:Animation::AnimationNode::create() |
97 .setDelay(delay) | 97 .setDelay(delay) |
| 98 .setEndDelay(computedTiming.endDelay()) |
98 .setPlaybackRate(computedTiming.playbackRate()) | 99 .setPlaybackRate(computedTiming.playbackRate()) |
99 .setIterationStart(computedTiming.iterationStart()) | 100 .setIterationStart(computedTiming.iterationStart()) |
100 .setIterations(computedTiming.iterations()) | 101 .setIterations(computedTiming.iterations()) |
101 .setDuration(duration) | 102 .setDuration(duration) |
102 .setDirection(computedTiming.direction()) | 103 .setDirection(computedTiming.direction()) |
103 .setFill(computedTiming.fill()) | 104 .setFill(computedTiming.fill()) |
104 .setName(animation->name()) | 105 .setName(animation->name()) |
105 .setBackendNodeId(InspectorNodeIds::idForNode(animation->target())) | 106 .setBackendNodeId(InspectorNodeIds::idForNode(animation->target())) |
106 .setEasing(easing); | 107 .setEasing(easing); |
107 return animationObject.release(); | 108 return animationObject.release(); |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 { | 305 { |
305 #if ENABLE(OILPAN) | 306 #if ENABLE(OILPAN) |
306 visitor->trace(m_pageAgent); | 307 visitor->trace(m_pageAgent); |
307 visitor->trace(m_domAgent); | 308 visitor->trace(m_domAgent); |
308 visitor->trace(m_idToAnimationPlayer); | 309 visitor->trace(m_idToAnimationPlayer); |
309 #endif | 310 #endif |
310 InspectorBaseAgent::trace(visitor); | 311 InspectorBaseAgent::trace(visitor); |
311 } | 312 } |
312 | 313 |
313 } | 314 } |
OLD | NEW |