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

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

Issue 1080523002: Oilpan: adjust AnimationTimeline finalization. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « no previous file | 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 /* 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 virtual bool hasPendingActivity() const override; 115 virtual bool hasPendingActivity() const override;
116 virtual void stop() override; 116 virtual void stop() override;
117 virtual bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>) override; 117 virtual bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>) override;
118 118
119 double playbackRate() const; 119 double playbackRate() const;
120 void setPlaybackRate(double); 120 void setPlaybackRate(double);
121 const AnimationTimeline* timeline() const { return m_timeline; } 121 const AnimationTimeline* timeline() const { return m_timeline; }
122 AnimationTimeline* timeline() { return m_timeline; } 122 AnimationTimeline* timeline() { return m_timeline; }
123 123
124 #if !ENABLE(OILPAN) 124 #if !ENABLE(OILPAN)
125 void timelineDestroyed() { m_timeline = nullptr; } 125 void detachFromTimeline();
126 #endif 126 #endif
127 127
128 double calculateStartTime(double currentTime) const; 128 double calculateStartTime(double currentTime) const;
129 bool hasStartTime() const { return !isNull(m_startTime); } 129 bool hasStartTime() const { return !isNull(m_startTime); }
130 double startTime(bool& isNull) const; 130 double startTime(bool& isNull) const;
131 double startTime() const; 131 double startTime() const;
132 double startTimeInternal() const { return m_startTime; } 132 double startTimeInternal() const { return m_startTime; }
133 void setStartTime(double); 133 void setStartTime(double);
134 void setStartTimeInternal(double); 134 void setStartTimeInternal(double);
135 135
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 279
280 OwnPtr<WebCompositorAnimationPlayer> m_compositorPlayer; 280 OwnPtr<WebCompositorAnimationPlayer> m_compositorPlayer;
281 281
282 bool m_currentTimePending; 282 bool m_currentTimePending;
283 bool m_stateIsBeingUpdated; 283 bool m_stateIsBeingUpdated;
284 }; 284 };
285 285
286 } // namespace blink 286 } // namespace blink
287 287
288 #endif // AnimationPlayer_h 288 #endif // AnimationPlayer_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/animation/AnimationPlayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698