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

Side by Side Diff: Source/core/animation/AnimationPlayer.h

Issue 556453004: Web Animations: Use null for unresolved startTime and currentTime in AnimationPlayer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Revert formatting change. Created 6 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 bool update(TimingUpdateReason); 63 bool update(TimingUpdateReason);
64 64
65 // timeToEffectChange returns: 65 // timeToEffectChange returns:
66 // infinity - if this player is no longer in effect 66 // infinity - if this player is no longer in effect
67 // 0 - if this player requires an update on the next frame 67 // 0 - if this player requires an update on the next frame
68 // n - if this player requires an update after 'n' units of time 68 // n - if this player requires an update after 'n' units of time
69 double timeToEffectChange(); 69 double timeToEffectChange();
70 70
71 void cancel(); 71 void cancel();
72 72
73 double currentTime(bool& isNull);
73 double currentTime(); 74 double currentTime();
74 void setCurrentTime(double newCurrentTime); 75 void setCurrentTime(double newCurrentTime);
75 76
76 double calculateCurrentTime() const; 77 double calculateCurrentTime() const;
77 double currentTimeInternal(); 78 double currentTimeInternal();
78 void setCurrentTimeInternal(double newCurrentTime, TimingUpdateReason = Timi ngUpdateOnDemand); 79 void setCurrentTimeInternal(double newCurrentTime, TimingUpdateReason = Timi ngUpdateOnDemand);
79 80
80 bool paused() const { return m_paused && !m_isPausedForTesting; } 81 bool paused() const { return m_paused && !m_isPausedForTesting; }
81 String playState(); 82 String playState();
82 AnimationPlayState playStateInternal(); 83 AnimationPlayState playStateInternal();
(...skipping 20 matching lines...) Expand all
103 void setPlaybackRate(double); 104 void setPlaybackRate(double);
104 const AnimationTimeline* timeline() const { return m_timeline; } 105 const AnimationTimeline* timeline() const { return m_timeline; }
105 AnimationTimeline* timeline() { return m_timeline; } 106 AnimationTimeline* timeline() { return m_timeline; }
106 107
107 #if !ENABLE(OILPAN) 108 #if !ENABLE(OILPAN)
108 void timelineDestroyed() { m_timeline = nullptr; } 109 void timelineDestroyed() { m_timeline = nullptr; }
109 #endif 110 #endif
110 111
111 double calculateStartTime(double currentTime) const; 112 double calculateStartTime(double currentTime) const;
112 bool hasStartTime() const { return !isNull(m_startTime); } 113 bool hasStartTime() const { return !isNull(m_startTime); }
114 double startTime(bool& isNull) const;
113 double startTime() const; 115 double startTime() const;
114 double startTimeInternal() const { return m_startTime; } 116 double startTimeInternal() const { return m_startTime; }
115 void setStartTime(double); 117 void setStartTime(double);
116 void setStartTimeInternal(double); 118 void setStartTimeInternal(double);
117 119
118 const AnimationNode* source() const { return m_content.get(); } 120 const AnimationNode* source() const { return m_content.get(); }
119 AnimationNode* source() { return m_content.get(); } 121 AnimationNode* source() { return m_content.get(); }
120 void setSource(AnimationNode*); 122 void setSource(AnimationNode*);
121 123
122 // Pausing via this method is not reflected in the value returned by 124 // Pausing via this method is not reflected in the value returned by
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 // modifications are pushed to the compositor. 227 // modifications are pushed to the compositor.
226 OwnPtr<CompositorState> m_compositorState; 228 OwnPtr<CompositorState> m_compositorState;
227 bool m_compositorPending; 229 bool m_compositorPending;
228 bool m_currentTimePending; 230 bool m_currentTimePending;
229 bool m_idle; 231 bool m_idle;
230 }; 232 };
231 233
232 } // namespace blink 234 } // namespace blink
233 235
234 #endif 236 #endif
OLDNEW
« no previous file with comments | « LayoutTests/web-animations-api/player-unresolved-times.html ('k') | Source/core/animation/AnimationPlayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698