| 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 "core/animation/TimingInput.h" | 5 #include "core/animation/TimingInput.h" |
| 6 | 6 |
| 7 #include "core/animation/AnimationInputHelpers.h" | 7 #include "core/animation/AnimationInputHelpers.h" |
| 8 #include "core/animation/KeyframeEffectOptions.h" | 8 #include "core/animation/KeyframeEffectOptions.h" |
| 9 | 9 |
| 10 namespace blink { | 10 namespace blink { |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 timing.direction = Timing::PlaybackDirectionReverse; | 78 timing.direction = Timing::PlaybackDirectionReverse; |
| 79 } else if (direction == "alternate") { | 79 } else if (direction == "alternate") { |
| 80 timing.direction = Timing::PlaybackDirectionAlternate; | 80 timing.direction = Timing::PlaybackDirectionAlternate; |
| 81 } else if (direction == "alternate-reverse") { | 81 } else if (direction == "alternate-reverse") { |
| 82 timing.direction = Timing::PlaybackDirectionAlternateReverse; | 82 timing.direction = Timing::PlaybackDirectionAlternateReverse; |
| 83 } else { | 83 } else { |
| 84 timing.direction = Timing::defaults().direction; | 84 timing.direction = Timing::defaults().direction; |
| 85 } | 85 } |
| 86 } | 86 } |
| 87 | 87 |
| 88 void TimingInput::setTimingFunction(Timing& timing, const String& timingFunction
String) | 88 void TimingInput::setTimingFunction(Timing& timing, const String& timingFunction
String, Document* document) |
| 89 { | 89 { |
| 90 if (RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimi
ngFunction(timingFunctionString)) | 90 if (RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimi
ngFunction(timingFunctionString, document)) |
| 91 timing.timingFunction = timingFunction; | 91 timing.timingFunction = timingFunction; |
| 92 else | 92 else |
| 93 timing.timingFunction = Timing::defaults().timingFunction; | 93 timing.timingFunction = Timing::defaults().timingFunction; |
| 94 } | 94 } |
| 95 | 95 |
| 96 Timing TimingInput::convert(const KeyframeEffectOptions& timingInput) | 96 Timing TimingInput::convert(const KeyframeEffectOptions& timingInput, Document*
document) |
| 97 { | 97 { |
| 98 Timing result; | 98 Timing result; |
| 99 | 99 |
| 100 setStartDelay(result, timingInput.delay()); | 100 setStartDelay(result, timingInput.delay()); |
| 101 setEndDelay(result, timingInput.endDelay()); | 101 setEndDelay(result, timingInput.endDelay()); |
| 102 setFillMode(result, timingInput.fill()); | 102 setFillMode(result, timingInput.fill()); |
| 103 setIterationStart(result, timingInput.iterationStart()); | 103 setIterationStart(result, timingInput.iterationStart()); |
| 104 setIterationCount(result, timingInput.iterations()); | 104 setIterationCount(result, timingInput.iterations()); |
| 105 if (timingInput.duration().isUnrestrictedDouble()) | 105 if (timingInput.duration().isUnrestrictedDouble()) |
| 106 setIterationDuration(result, timingInput.duration().getAsUnrestrictedDou
ble()); | 106 setIterationDuration(result, timingInput.duration().getAsUnrestrictedDou
ble()); |
| 107 else | 107 else |
| 108 setIterationDuration(result, -1); | 108 setIterationDuration(result, -1); |
| 109 setPlaybackRate(result, timingInput.playbackRate()); | 109 setPlaybackRate(result, timingInput.playbackRate()); |
| 110 setPlaybackDirection(result, timingInput.direction()); | 110 setPlaybackDirection(result, timingInput.direction()); |
| 111 setTimingFunction(result, timingInput.easing()); | 111 setTimingFunction(result, timingInput.easing(), document); |
| 112 | 112 |
| 113 result.assertValid(); | 113 result.assertValid(); |
| 114 | 114 |
| 115 return result; | 115 return result; |
| 116 } | 116 } |
| 117 | 117 |
| 118 Timing TimingInput::convert(double duration) | 118 Timing TimingInput::convert(double duration) |
| 119 { | 119 { |
| 120 Timing result; | 120 Timing result; |
| 121 setIterationDuration(result, duration); | 121 setIterationDuration(result, duration); |
| 122 return result; | 122 return result; |
| 123 } | 123 } |
| 124 | 124 |
| 125 } // namespace blink | 125 } // namespace blink |
| OLD | NEW |