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

Unified Diff: Source/devtools/front_end/sdk/AnimationModel.js

Issue 967213002: Devtools Animations: Represent delay and end-delay on the animation timeline (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Round values 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/front_end/elements/animationTimeline.css ('k') | Source/devtools/protocol.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/sdk/AnimationModel.js
diff --git a/Source/devtools/front_end/sdk/AnimationModel.js b/Source/devtools/front_end/sdk/AnimationModel.js
index b0e8aa71c4aa4870e05612e6676d54fd43cae276..96923241045eec51b81fbc442221089ddcea879a 100644
--- a/Source/devtools/front_end/sdk/AnimationModel.js
+++ b/Source/devtools/front_end/sdk/AnimationModel.js
@@ -152,7 +152,7 @@ WebInspector.AnimationModel.AnimationPlayer.prototype = {
{
if (!this.source().iterations)
return Infinity;
- return this.startTime() + this.source().duration() * this.source().iterations();
+ return this.startTime() + this.source().delay() + this.source().duration() * this.source().iterations() + this.source().endDelay();
},
/**
@@ -233,6 +233,14 @@ WebInspector.AnimationModel.AnimationNode.prototype = {
/**
* @return {number}
*/
+ endDelay: function()
+ {
+ return this._payload.endDelay;
+ },
+
+ /**
+ * @return {number}
+ */
playbackRate: function()
{
return this._payload.playbackRate;
@@ -251,7 +259,7 @@ WebInspector.AnimationModel.AnimationNode.prototype = {
*/
iterations: function()
{
- return this._payload.iterations;
+ return this._payload.iterations || Infinity;
},
/**
« no previous file with comments | « Source/devtools/front_end/elements/animationTimeline.css ('k') | Source/devtools/protocol.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698