| 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 "config.h" | 5 #include "config.h" |
| 6 #include "core/animation/TimingInput.h" | 6 #include "core/animation/TimingInput.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/Dictionary.h" | 8 #include "bindings/core/v8/Dictionary.h" |
| 9 #include "core/css/parser/BisonCSSParser.h" | 9 #include "core/css/parser/BisonCSSParser.h" |
| 10 #include "core/css/resolver/CSSToStyleMap.h" | 10 #include "core/css/resolver/CSSToStyleMap.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 } | 96 } |
| 97 | 97 |
| 98 Timing TimingInput::convert(const Dictionary& timingInputDictionary) | 98 Timing TimingInput::convert(const Dictionary& timingInputDictionary) |
| 99 { | 99 { |
| 100 Timing result; | 100 Timing result; |
| 101 | 101 |
| 102 // FIXME: This method needs to be refactored to handle invalid | 102 // FIXME: This method needs to be refactored to handle invalid |
| 103 // null, NaN, Infinity values better. | 103 // null, NaN, Infinity values better. |
| 104 // See: http://www.w3.org/TR/WebIDL/#es-double | 104 // See: http://www.w3.org/TR/WebIDL/#es-double |
| 105 double startDelay = Timing::defaults().startDelay; | 105 double startDelay = Timing::defaults().startDelay; |
| 106 DictionaryHelper::get(timingInputDictionary, "delay", startDelay); | 106 timingInputDictionary.get("delay", startDelay); |
| 107 setStartDelay(result, startDelay); | 107 setStartDelay(result, startDelay); |
| 108 | 108 |
| 109 double endDelay = Timing::defaults().endDelay; | 109 double endDelay = Timing::defaults().endDelay; |
| 110 DictionaryHelper::get(timingInputDictionary, "endDelay", endDelay); | 110 timingInputDictionary.get("endDelay", endDelay); |
| 111 setEndDelay(result, endDelay); | 111 setEndDelay(result, endDelay); |
| 112 | 112 |
| 113 String fillMode; | 113 String fillMode; |
| 114 DictionaryHelper::get(timingInputDictionary, "fill", fillMode); | 114 timingInputDictionary.get("fill", fillMode); |
| 115 setFillMode(result, fillMode); | 115 setFillMode(result, fillMode); |
| 116 | 116 |
| 117 double iterationStart = Timing::defaults().iterationStart; | 117 double iterationStart = Timing::defaults().iterationStart; |
| 118 DictionaryHelper::get(timingInputDictionary, "iterationStart", iterationStar
t); | 118 timingInputDictionary.get("iterationStart", iterationStart); |
| 119 setIterationStart(result, iterationStart); | 119 setIterationStart(result, iterationStart); |
| 120 | 120 |
| 121 double iterationCount = Timing::defaults().iterationCount; | 121 double iterationCount = Timing::defaults().iterationCount; |
| 122 DictionaryHelper::get(timingInputDictionary, "iterations", iterationCount); | 122 timingInputDictionary.get("iterations", iterationCount); |
| 123 setIterationCount(result, iterationCount); | 123 setIterationCount(result, iterationCount); |
| 124 | 124 |
| 125 double iterationDuration = 0; | 125 double iterationDuration = 0; |
| 126 if (DictionaryHelper::get(timingInputDictionary, "duration", iterationDurati
on)) { | 126 if (timingInputDictionary.get("duration", iterationDuration)) { |
| 127 setIterationDuration(result, iterationDuration); | 127 setIterationDuration(result, iterationDuration); |
| 128 } | 128 } |
| 129 | 129 |
| 130 double playbackRate = Timing::defaults().playbackRate; | 130 double playbackRate = Timing::defaults().playbackRate; |
| 131 DictionaryHelper::get(timingInputDictionary, "playbackRate", playbackRate); | 131 timingInputDictionary.get("playbackRate", playbackRate); |
| 132 setPlaybackRate(result, playbackRate); | 132 setPlaybackRate(result, playbackRate); |
| 133 | 133 |
| 134 String direction; | 134 String direction; |
| 135 DictionaryHelper::get(timingInputDictionary, "direction", direction); | 135 timingInputDictionary.get("direction", direction); |
| 136 setPlaybackDirection(result, direction); | 136 setPlaybackDirection(result, direction); |
| 137 | 137 |
| 138 String timingFunctionString; | 138 String timingFunctionString; |
| 139 DictionaryHelper::get(timingInputDictionary, "easing", timingFunctionString)
; | 139 timingInputDictionary.get("easing", timingFunctionString); |
| 140 setTimingFunction(result, timingFunctionString); | 140 setTimingFunction(result, timingFunctionString); |
| 141 | 141 |
| 142 result.assertValid(); | 142 result.assertValid(); |
| 143 | 143 |
| 144 return result; | 144 return result; |
| 145 } | 145 } |
| 146 | 146 |
| 147 Timing TimingInput::convert(double duration) | 147 Timing TimingInput::convert(double duration) |
| 148 { | 148 { |
| 149 Timing result; | 149 Timing result; |
| 150 setIterationDuration(result, duration); | 150 setIterationDuration(result, duration); |
| 151 return result; | 151 return result; |
| 152 } | 152 } |
| 153 | 153 |
| 154 } // namespace blink | 154 } // namespace blink |
| OLD | NEW |