| 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 void postCommit(double timelineTime); | 155 void postCommit(double timelineTime); |
| 156 | 156 |
| 157 unsigned sequenceNumber() const { return m_sequenceNumber; } | 157 unsigned sequenceNumber() const { return m_sequenceNumber; } |
| 158 int compositorGroup() const { return m_compositorGroup; } | 158 int compositorGroup() const { return m_compositorGroup; } |
| 159 | 159 |
| 160 static bool hasLowerPriority(const AnimationPlayer* player1, const Animation
Player* player2) | 160 static bool hasLowerPriority(const AnimationPlayer* player1, const Animation
Player* player2) |
| 161 { | 161 { |
| 162 return player1->sequenceNumber() < player2->sequenceNumber(); | 162 return player1->sequenceNumber() < player2->sequenceNumber(); |
| 163 } | 163 } |
| 164 | 164 |
| 165 #if !ENABLE(OILPAN) | |
| 166 // Checks if the AnimationStack is the last reference holder to the Player. | |
| 167 // This won't be needed when AnimationPlayer is moved to Oilpan. | |
| 168 bool canFree() const; | |
| 169 #endif | |
| 170 | |
| 171 virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<Even
tListener>, bool useCapture = false) override; | 165 virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<Even
tListener>, bool useCapture = false) override; |
| 172 | 166 |
| 173 DECLARE_VIRTUAL_TRACE(); | 167 DECLARE_VIRTUAL_TRACE(); |
| 174 | 168 |
| 175 private: | 169 private: |
| 176 AnimationPlayer(ExecutionContext*, AnimationTimeline&, AnimationNode*); | 170 AnimationPlayer(ExecutionContext*, AnimationTimeline&, AnimationNode*); |
| 177 | 171 |
| 178 double sourceEnd() const; | 172 double sourceEnd() const; |
| 179 bool limited(double currentTime) const; | 173 bool limited(double currentTime) const; |
| 180 | 174 |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 int m_compositorGroup; | 258 int m_compositorGroup; |
| 265 | 259 |
| 266 bool m_currentTimePending; | 260 bool m_currentTimePending; |
| 267 bool m_stateIsBeingUpdated; | 261 bool m_stateIsBeingUpdated; |
| 268 | 262 |
| 269 }; | 263 }; |
| 270 | 264 |
| 271 } // namespace blink | 265 } // namespace blink |
| 272 | 266 |
| 273 #endif // AnimationPlayer_h | 267 #endif // AnimationPlayer_h |
| OLD | NEW |