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

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

Issue 939623002: Add TypeChecking=Unrestricted to Web Animation APIs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Drop AnimationAnimationPlayerTest.SetCurrentTimeUnrestrictedDouble Created 5 years, 10 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/AnimationNodeTiming.h ('k') | Source/core/animation/AnimationPlayer.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/AnimationNodeTiming.h" 6 #include "core/animation/AnimationNodeTiming.h"
7 7
8 #include "bindings/core/v8/UnionTypesCore.h" 8 #include "bindings/core/v8/UnionTypesCore.h"
9 #include "core/animation/Animation.h" 9 #include "core/animation/Animation.h"
10 #include "core/animation/AnimationNode.h" 10 #include "core/animation/AnimationNode.h"
(...skipping 29 matching lines...) Expand all
40 double AnimationNodeTiming::iterationStart() 40 double AnimationNodeTiming::iterationStart()
41 { 41 {
42 return m_parent->specifiedTiming().iterationStart; 42 return m_parent->specifiedTiming().iterationStart;
43 } 43 }
44 44
45 double AnimationNodeTiming::iterations() 45 double AnimationNodeTiming::iterations()
46 { 46 {
47 return m_parent->specifiedTiming().iterationCount; 47 return m_parent->specifiedTiming().iterationCount;
48 } 48 }
49 49
50 void AnimationNodeTiming::duration(DoubleOrString& returnValue) 50 void AnimationNodeTiming::duration(UnrestrictedDoubleOrString& returnValue)
51 { 51 {
52 if (std::isnan(m_parent->specifiedTiming().iterationDuration)) 52 if (std::isnan(m_parent->specifiedTiming().iterationDuration))
53 returnValue.setString("auto"); 53 returnValue.setString("auto");
54 else 54 else
55 returnValue.setDouble(m_parent->specifiedTiming().iterationDuration * 10 00); 55 returnValue.setUnrestrictedDouble(m_parent->specifiedTiming().iterationD uration * 1000);
56 } 56 }
57 57
58 double AnimationNodeTiming::playbackRate() 58 double AnimationNodeTiming::playbackRate()
59 { 59 {
60 return m_parent->specifiedTiming().playbackRate; 60 return m_parent->specifiedTiming().playbackRate;
61 } 61 }
62 62
63 String AnimationNodeTiming::direction() 63 String AnimationNodeTiming::direction()
64 { 64 {
65 return Timing::playbackDirectionString(m_parent->specifiedTiming().direction ); 65 return Timing::playbackDirectionString(m_parent->specifiedTiming().direction );
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 m_parent->updateSpecifiedTiming(timing); 98 m_parent->updateSpecifiedTiming(timing);
99 } 99 }
100 100
101 void AnimationNodeTiming::setIterations(double iterations) 101 void AnimationNodeTiming::setIterations(double iterations)
102 { 102 {
103 Timing timing = m_parent->specifiedTiming(); 103 Timing timing = m_parent->specifiedTiming();
104 TimingInput::setIterationCount(timing, iterations); 104 TimingInput::setIterationCount(timing, iterations);
105 m_parent->updateSpecifiedTiming(timing); 105 m_parent->updateSpecifiedTiming(timing);
106 } 106 }
107 107
108 void AnimationNodeTiming::setDuration(const DoubleOrString& durationOrAuto) 108 void AnimationNodeTiming::setDuration(const UnrestrictedDoubleOrString& duration OrAuto)
109 { 109 {
110 // Any strings other than "auto" are coerced to "auto". 110 // Any strings other than "auto" are coerced to "auto".
111 double duration = durationOrAuto.isString() ? std::numeric_limits<double>::q uiet_NaN() : durationOrAuto.getAsDouble(); 111 double duration = durationOrAuto.isString() ? std::numeric_limits<double>::q uiet_NaN() : durationOrAuto.getAsUnrestrictedDouble();
112 Timing timing = m_parent->specifiedTiming(); 112 Timing timing = m_parent->specifiedTiming();
113 TimingInput::setIterationDuration(timing, duration); 113 TimingInput::setIterationDuration(timing, duration);
114 m_parent->updateSpecifiedTiming(timing); 114 m_parent->updateSpecifiedTiming(timing);
115 } 115 }
116 116
117 void AnimationNodeTiming::setPlaybackRate(double playbackRate) 117 void AnimationNodeTiming::setPlaybackRate(double playbackRate)
118 { 118 {
119 Timing timing = m_parent->specifiedTiming(); 119 Timing timing = m_parent->specifiedTiming();
120 TimingInput::setPlaybackRate(timing, playbackRate); 120 TimingInput::setPlaybackRate(timing, playbackRate);
121 m_parent->updateSpecifiedTiming(timing); 121 m_parent->updateSpecifiedTiming(timing);
(...skipping 12 matching lines...) Expand all
134 TimingInput::setTimingFunction(timing, easing); 134 TimingInput::setTimingFunction(timing, easing);
135 m_parent->updateSpecifiedTiming(timing); 135 m_parent->updateSpecifiedTiming(timing);
136 } 136 }
137 137
138 void AnimationNodeTiming::trace(Visitor* visitor) 138 void AnimationNodeTiming::trace(Visitor* visitor)
139 { 139 {
140 visitor->trace(m_parent); 140 visitor->trace(m_parent);
141 } 141 }
142 142
143 } // namespace blink 143 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/AnimationNodeTiming.h ('k') | Source/core/animation/AnimationPlayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698