| 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, |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 if (typeof timingInput[property] != 'number' || isNaN(timingInput[pr
operty])) { | 38 if (typeof timingInput[property] != 'number' || isNaN(timingInput[pr
operty])) { |
| 39 return; | 39 return; |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 if ((property == 'fill') && (fills.indexOf(timingInput[property]) == -
1)) { | 42 if ((property == 'fill') && (fills.indexOf(timingInput[property]) == -
1)) { |
| 43 return; | 43 return; |
| 44 } | 44 } |
| 45 if ((property == 'direction') && (directions.indexOf(timingInput[prope
rty]) == -1)) { | 45 if ((property == 'direction') && (directions.indexOf(timingInput[prope
rty]) == -1)) { |
| 46 return; | 46 return; |
| 47 } | 47 } |
| 48 if (property == 'playbackRate' && shared.isDeprecated('AnimationTiming
.playbackRate', '2014-11-28', 'Use AnimationPlayer.playbackRate instead.')) { |
| 49 return; |
| 50 } |
| 48 timing[property] = timingInput[property]; | 51 timing[property] = timingInput[property]; |
| 49 } | 52 } |
| 50 }); | 53 }); |
| 51 } | 54 } |
| 52 return timing; | 55 return timing; |
| 53 } | 56 } |
| 54 | 57 |
| 55 function normalizeTimingInput(timingInput, forGroup) { | 58 function normalizeTimingInput(timingInput, forGroup) { |
| 56 var timing = makeTiming(timingInput, forGroup); | 59 var timing = makeTiming(timingInput, forGroup); |
| 57 timing.easing = toTimingFunction(timing.easing); | 60 timing.easing = toTimingFunction(timing.easing); |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 testing.PhaseActive = PhaseActive; | 233 testing.PhaseActive = PhaseActive; |
| 231 testing.PhaseAfter = PhaseAfter; | 234 testing.PhaseAfter = PhaseAfter; |
| 232 testing.calculateActiveTime = calculateActiveTime; | 235 testing.calculateActiveTime = calculateActiveTime; |
| 233 testing.calculateScaledActiveTime = calculateScaledActiveTime; | 236 testing.calculateScaledActiveTime = calculateScaledActiveTime; |
| 234 testing.calculateIterationTime = calculateIterationTime; | 237 testing.calculateIterationTime = calculateIterationTime; |
| 235 testing.calculateCurrentIteration = calculateCurrentIteration; | 238 testing.calculateCurrentIteration = calculateCurrentIteration; |
| 236 testing.calculateTransformedTime = calculateTransformedTime; | 239 testing.calculateTransformedTime = calculateTransformedTime; |
| 237 } | 240 } |
| 238 | 241 |
| 239 })(webAnimationsShared, webAnimationsTesting); | 242 })(webAnimationsShared, webAnimationsTesting); |
| OLD | NEW |