Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: Source/core/animation/TimingInput.cpp

Issue 1113173003: Web Animations: Update naming to reflect spec changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: No, really. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/animation/TimingInput.h ('k') | Source/core/animation/TimingInputTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "core/animation/AnimationInputHelpers.h" 8 #include "core/animation/AnimationInputHelpers.h"
9 #include "core/animation/AnimationTimingProperties.h" 9 #include "core/animation/KeyframeEffectOptions.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 void TimingInput::setStartDelay(Timing& timing, double startDelay) 13 void TimingInput::setStartDelay(Timing& timing, double startDelay)
14 { 14 {
15 if (std::isfinite(startDelay)) 15 if (std::isfinite(startDelay))
16 timing.startDelay = startDelay / 1000; 16 timing.startDelay = startDelay / 1000;
17 else 17 else
18 timing.startDelay = Timing::defaults().startDelay; 18 timing.startDelay = Timing::defaults().startDelay;
19 } 19 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 } 87 }
88 88
89 void TimingInput::setTimingFunction(Timing& timing, const String& timingFunction String) 89 void TimingInput::setTimingFunction(Timing& timing, const String& timingFunction String)
90 { 90 {
91 if (RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimi ngFunction(timingFunctionString)) 91 if (RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimi ngFunction(timingFunctionString))
92 timing.timingFunction = timingFunction; 92 timing.timingFunction = timingFunction;
93 else 93 else
94 timing.timingFunction = Timing::defaults().timingFunction; 94 timing.timingFunction = Timing::defaults().timingFunction;
95 } 95 }
96 96
97 Timing TimingInput::convert(const AnimationTimingProperties& timingInput) 97 Timing TimingInput::convert(const KeyframeEffectOptions& timingInput)
98 { 98 {
99 Timing result; 99 Timing result;
100 100
101 setStartDelay(result, timingInput.delay()); 101 setStartDelay(result, timingInput.delay());
102 setEndDelay(result, timingInput.endDelay()); 102 setEndDelay(result, timingInput.endDelay());
103 setFillMode(result, timingInput.fill()); 103 setFillMode(result, timingInput.fill());
104 setIterationStart(result, timingInput.iterationStart()); 104 setIterationStart(result, timingInput.iterationStart());
105 setIterationCount(result, timingInput.iterations()); 105 setIterationCount(result, timingInput.iterations());
106 if (timingInput.duration().isUnrestrictedDouble()) 106 if (timingInput.duration().isUnrestrictedDouble())
107 setIterationDuration(result, timingInput.duration().getAsUnrestrictedDou ble()); 107 setIterationDuration(result, timingInput.duration().getAsUnrestrictedDou ble());
108 else 108 else
109 setIterationDuration(result, -1); 109 setIterationDuration(result, -1);
110 setPlaybackRate(result, timingInput.playbackRate()); 110 setPlaybackRate(result, timingInput.playbackRate());
111 setPlaybackDirection(result, timingInput.direction()); 111 setPlaybackDirection(result, timingInput.direction());
112 setTimingFunction(result, timingInput.easing()); 112 setTimingFunction(result, timingInput.easing());
113 113
114 result.assertValid(); 114 result.assertValid();
115 115
116 return result; 116 return result;
117 } 117 }
118 118
119 Timing TimingInput::convert(double duration) 119 Timing TimingInput::convert(double duration)
120 { 120 {
121 Timing result; 121 Timing result;
122 setIterationDuration(result, duration); 122 setIterationDuration(result, duration);
123 return result; 123 return result;
124 } 124 }
125 125
126 } // namespace blink 126 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/TimingInput.h ('k') | Source/core/animation/TimingInputTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698