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

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

Issue 2047293002: Code cleanup: Replace Element with Document in element.animate() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_killForceConversionsToAnimatableValues
Patch Set: Fix unit test crash. Created 4 years, 5 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
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 "core/animation/TimingInput.h" 5 #include "core/animation/TimingInput.h"
6 6
7 #include "bindings/core/v8/ExceptionState.h" 7 #include "bindings/core/v8/ExceptionState.h"
8 #include "core/animation/AnimationInputHelpers.h" 8 #include "core/animation/AnimationInputHelpers.h"
9 #include "core/animation/KeyframeEffectOptions.h" 9 #include "core/animation/KeyframeEffectOptions.h"
10 10
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 timing.direction = Timing::PlaybackDirectionReverse; 99 timing.direction = Timing::PlaybackDirectionReverse;
100 } else if (direction == "alternate") { 100 } else if (direction == "alternate") {
101 timing.direction = Timing::PlaybackDirectionAlternate; 101 timing.direction = Timing::PlaybackDirectionAlternate;
102 } else if (direction == "alternate-reverse") { 102 } else if (direction == "alternate-reverse") {
103 timing.direction = Timing::PlaybackDirectionAlternateReverse; 103 timing.direction = Timing::PlaybackDirectionAlternateReverse;
104 } else { 104 } else {
105 timing.direction = Timing::defaults().direction; 105 timing.direction = Timing::defaults().direction;
106 } 106 }
107 } 107 }
108 108
109 bool TimingInput::setTimingFunction(Timing& timing, const String& timingFunction String, Document* document, ExceptionState& exceptionState) 109 bool TimingInput::setTimingFunction(Timing& timing, const String& timingFunction String, Document& document, ExceptionState& exceptionState)
110 { 110 {
111 if (RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimi ngFunction(timingFunctionString, document, exceptionState)) { 111 if (RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimi ngFunction(timingFunctionString, document, exceptionState)) {
112 timing.timingFunction = timingFunction; 112 timing.timingFunction = timingFunction;
113 return true; 113 return true;
114 } 114 }
115 return false; 115 return false;
116 } 116 }
117 117
118 bool TimingInput::convert(const KeyframeEffectOptions& timingInput, Timing& timi ngOutput, Document* document, ExceptionState& exceptionState) 118 bool TimingInput::convert(const KeyframeEffectOptions& timingInput, Timing& timi ngOutput, Document& document, ExceptionState& exceptionState)
119 { 119 {
120 setStartDelay(timingOutput, timingInput.delay()); 120 setStartDelay(timingOutput, timingInput.delay());
121 setEndDelay(timingOutput, timingInput.endDelay()); 121 setEndDelay(timingOutput, timingInput.endDelay());
122 setFillMode(timingOutput, timingInput.fill()); 122 setFillMode(timingOutput, timingInput.fill());
123 123
124 if (!setIterationStart(timingOutput, timingInput.iterationStart(), exception State)) 124 if (!setIterationStart(timingOutput, timingInput.iterationStart(), exception State))
125 return false; 125 return false;
126 126
127 if (!setIterationCount(timingOutput, timingInput.iterations(), exceptionStat e)) 127 if (!setIterationCount(timingOutput, timingInput.iterations(), exceptionStat e))
128 return false; 128 return false;
(...skipping 12 matching lines...) Expand all
141 return true; 141 return true;
142 } 142 }
143 143
144 bool TimingInput::convert(double duration, Timing& timingOutput, ExceptionState& exceptionState) 144 bool TimingInput::convert(double duration, Timing& timingOutput, ExceptionState& exceptionState)
145 { 145 {
146 ASSERT(timingOutput == Timing::defaults()); 146 ASSERT(timingOutput == Timing::defaults());
147 return setIterationDuration(timingOutput, UnrestrictedDoubleOrString::fromUn restrictedDouble(duration), exceptionState); 147 return setIterationDuration(timingOutput, UnrestrictedDoubleOrString::fromUn restrictedDouble(duration), exceptionState);
148 } 148 }
149 149
150 } // namespace blink 150 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/TimingInput.h ('k') | third_party/WebKit/Source/core/animation/TimingInputTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698