Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2015 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 /** | 5 /** |
| 6 * @constructor | 6 * @constructor |
| 7 * @extends {WebInspector.VBox} | 7 * @extends {WebInspector.VBox} |
| 8 */ | 8 */ |
| 9 WebInspector.AnimationTimeline = function() | 9 WebInspector.AnimationTimeline = function() |
| 10 { | 10 { |
| (...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 779 this._movementInMs = (event.clientX - this._downMouseX) / this._timeline .pixelMsRatio(); | 779 this._movementInMs = (event.clientX - this._downMouseX) / this._timeline .pixelMsRatio(); |
| 780 | 780 |
| 781 // Commit changes | 781 // Commit changes |
| 782 if (this._mouseEventType === WebInspector.AnimationUI.MouseEvents.Keyfra meMove) { | 782 if (this._mouseEventType === WebInspector.AnimationUI.MouseEvents.Keyfra meMove) { |
| 783 this._keyframes[this._keyframeMoved].setOffset(this._offset(this._ke yframeMoved)); | 783 this._keyframes[this._keyframeMoved].setOffset(this._offset(this._ke yframeMoved)); |
| 784 } else { | 784 } else { |
| 785 var delay = this._delay(); | 785 var delay = this._delay(); |
| 786 var duration = this._duration(); | 786 var duration = this._duration(); |
| 787 this._setDelay(delay); | 787 this._setDelay(delay); |
| 788 this._setDuration(duration); | 788 this._setDuration(duration); |
| 789 // FIXME: Transition timing updates currently not supported | 789 if (this._animation.type() !== "CSSAnimation") { |
|
dgozman
2015/03/30 10:38:58
What about CSSAnimation? Should you leave the FIXM
samli
2015/03/30 23:14:17
No, CSS animations are already supported in http:/
| |
| 790 if (this._animation.type() == "WebAnimation") { | |
| 791 var target = WebInspector.targetManager.mainTarget(); | 790 var target = WebInspector.targetManager.mainTarget(); |
| 792 if (target) | 791 if (target) |
| 793 target.animationAgent().setTiming(this._animation.id(), dura tion, delay); | 792 target.animationAgent().setTiming(this._animation.id(), dura tion, delay, this._animation.type() === "CSSTransition"); |
| 794 } | 793 } |
| 795 } | 794 } |
| 796 | 795 |
| 797 this._movementInMs = 0; | 796 this._movementInMs = 0; |
| 798 this.redraw(); | 797 this.redraw(); |
| 799 | 798 |
| 800 this._parentElement.ownerDocument.removeEventListener("mousemove", this. _mouseMoveHandler); | 799 this._parentElement.ownerDocument.removeEventListener("mousemove", this. _mouseMoveHandler); |
| 801 this._parentElement.ownerDocument.removeEventListener("mouseup", this._m ouseUpHandler); | 800 this._parentElement.ownerDocument.removeEventListener("mouseup", this._m ouseUpHandler); |
| 802 delete this._mouseMoveHandler; | 801 delete this._mouseMoveHandler; |
| 803 delete this._mouseUpHandler; | 802 delete this._mouseUpHandler; |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 896 "Light Blue": WebInspector.Color.parse("#03A9F4"), | 895 "Light Blue": WebInspector.Color.parse("#03A9F4"), |
| 897 "Deep Orange": WebInspector.Color.parse("#FF5722"), | 896 "Deep Orange": WebInspector.Color.parse("#FF5722"), |
| 898 "Blue": WebInspector.Color.parse("#5677FC"), | 897 "Blue": WebInspector.Color.parse("#5677FC"), |
| 899 "Lime": WebInspector.Color.parse("#CDDC39"), | 898 "Lime": WebInspector.Color.parse("#CDDC39"), |
| 900 "Blue Grey": WebInspector.Color.parse("#607D8B"), | 899 "Blue Grey": WebInspector.Color.parse("#607D8B"), |
| 901 "Pink": WebInspector.Color.parse("#E91E63"), | 900 "Pink": WebInspector.Color.parse("#E91E63"), |
| 902 "Green": WebInspector.Color.parse("#0F9D58"), | 901 "Green": WebInspector.Color.parse("#0F9D58"), |
| 903 "Brown": WebInspector.Color.parse("#795548"), | 902 "Brown": WebInspector.Color.parse("#795548"), |
| 904 "Cyan": WebInspector.Color.parse("#00BCD4") | 903 "Cyan": WebInspector.Color.parse("#00BCD4") |
| 905 } | 904 } |
| OLD | NEW |