| OLD | NEW |
| 1 // Copyright 2014 Google Inc. All rights reserved. | 1 // Copyright 2014 Google Inc. All rights reserved. |
| 2 // | 2 // |
| 3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
| 5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
| 6 // | 6 // |
| 7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 // | 8 // |
| 9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
| 10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
| 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 // See the License for the specific language governing permissions and | 12 // See the License for the specific language governing permissions and |
| 13 // limitations under the License. | 13 // limitations under the License. |
| 14 (function(shared, scope, testing) { | 14 (function(shared, scope, testing) { |
| 15 | 15 |
| 16 var nullTarget = document.createElement('div'); | 16 var nullTarget = document.createElementNS('http://www.w3.org/1999/xhtml', 'div
'); |
| 17 | 17 |
| 18 var sequenceNumber = 0; | 18 var sequenceNumber = 0; |
| 19 scope.bindPlayerForCustomEffect = function(player) { | 19 scope.bindPlayerForCustomEffect = function(player) { |
| 20 var target = player.source.target; | 20 var target = player.source.target; |
| 21 var effect = player.source.effect; | 21 var effect = player.source.effect; |
| 22 var timing = player.source.timing; | 22 var timing = player.source.timing; |
| 23 var last = undefined; | 23 var last = undefined; |
| 24 timing = shared.normalizeTimingInput(timing); | 24 timing = shared.normalizeTimingInput(timing); |
| 25 var callback = function() { | 25 var callback = function() { |
| 26 var t = callback._player ? callback._player.currentTime : null; | 26 var t = callback._player ? callback._player.currentTime : null; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 } else { | 76 } else { |
| 77 ticking = false; | 77 ticking = false; |
| 78 } | 78 } |
| 79 } | 79 } |
| 80 | 80 |
| 81 scope.Player.prototype._register = function() { | 81 scope.Player.prototype._register = function() { |
| 82 if (this._callback) | 82 if (this._callback) |
| 83 register(this._callback); | 83 register(this._callback); |
| 84 }; | 84 }; |
| 85 | 85 |
| 86 })(webAnimationsShared, webAnimationsMaxifill, webAnimationsTesting); | 86 })(webAnimationsShared, webAnimationsNext, webAnimationsTesting); |
| OLD | NEW |