OLD | NEW |
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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 | 136 |
137 bool canStartAnimationOnCompositor(); | 137 bool canStartAnimationOnCompositor(); |
138 bool maybeStartAnimationOnCompositor(); | 138 bool maybeStartAnimationOnCompositor(); |
139 void cancelAnimationOnCompositor(); | 139 void cancelAnimationOnCompositor(); |
140 bool hasActiveAnimationsOnCompositor(); | 140 bool hasActiveAnimationsOnCompositor(); |
141 void setCompositorPending(bool sourceChanged = false); | 141 void setCompositorPending(bool sourceChanged = false); |
142 void notifyCompositorStartTime(double timelineTime); | 142 void notifyCompositorStartTime(double timelineTime); |
143 void notifyStartTime(double timelineTime); | 143 void notifyStartTime(double timelineTime); |
144 | 144 |
145 | 145 |
146 void preCommit(bool startOnCompositor); | 146 void preCommit(int compositorGroup, bool startOnCompositor); |
147 void postCommit(double timelineTime); | 147 void postCommit(double timelineTime); |
148 | 148 |
149 unsigned sequenceNumber() const { return m_sequenceNumber; } | 149 unsigned sequenceNumber() const { return m_sequenceNumber; } |
| 150 int compositorGroup() const { return m_compositorGroup; } |
150 | 151 |
151 static bool hasLowerPriority(AnimationPlayer* player1, AnimationPlayer* play
er2) | 152 static bool hasLowerPriority(AnimationPlayer* player1, AnimationPlayer* play
er2) |
152 { | 153 { |
153 return player1->sequenceNumber() < player2->sequenceNumber(); | 154 return player1->sequenceNumber() < player2->sequenceNumber(); |
154 } | 155 } |
155 | 156 |
156 #if !ENABLE(OILPAN) | 157 #if !ENABLE(OILPAN) |
157 // Checks if the AnimationStack is the last reference holder to the Player. | 158 // Checks if the AnimationStack is the last reference holder to the Player. |
158 // This won't be needed when AnimationPlayer is moved to Oilpan. | 159 // This won't be needed when AnimationPlayer is moved to Oilpan. |
159 bool canFree() const; | 160 bool canFree() const; |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 AnimationPlayer& m_player; | 241 AnimationPlayer& m_player; |
241 AnimationPlayState m_initial; | 242 AnimationPlayState m_initial; |
242 CompositorPendingChange m_compositorPendingChange; | 243 CompositorPendingChange m_compositorPendingChange; |
243 }; | 244 }; |
244 | 245 |
245 // This mirrors the known compositor state. It is created when a compositor | 246 // This mirrors the known compositor state. It is created when a compositor |
246 // animation is started. Updated once the start time is known and each time | 247 // animation is started. Updated once the start time is known and each time |
247 // modifications are pushed to the compositor. | 248 // modifications are pushed to the compositor. |
248 OwnPtr<CompositorState> m_compositorState; | 249 OwnPtr<CompositorState> m_compositorState; |
249 bool m_compositorPending; | 250 bool m_compositorPending; |
| 251 int m_compositorGroup; |
| 252 |
250 bool m_currentTimePending; | 253 bool m_currentTimePending; |
251 }; | 254 }; |
252 | 255 |
253 } // namespace blink | 256 } // namespace blink |
254 | 257 |
255 #endif // AnimationPlayer_h | 258 #endif // AnimationPlayer_h |
OLD | NEW |