Index: sky/engine/core/animation/PendingAnimations.h |
diff --git a/sky/engine/core/animation/CompositorPendingAnimations.h b/sky/engine/core/animation/PendingAnimations.h |
similarity index 77% |
rename from sky/engine/core/animation/CompositorPendingAnimations.h |
rename to sky/engine/core/animation/PendingAnimations.h |
index a350da1848fd7d2f0262771fb3ecde27f95e72cb..101fb8338e9e2b35eba50097605e7c454315742b 100644 |
--- a/sky/engine/core/animation/CompositorPendingAnimations.h |
+++ b/sky/engine/core/animation/PendingAnimations.h |
@@ -28,8 +28,8 @@ |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef SKY_ENGINE_CORE_ANIMATION_COMPOSITORPENDINGANIMATIONS_H_ |
-#define SKY_ENGINE_CORE_ANIMATION_COMPOSITORPENDINGANIMATIONS_H_ |
+#ifndef SKY_ENGINE_CORE_ANIMATION_PENDINGANIMATIONS_H_ |
+#define SKY_ENGINE_CORE_ANIMATION_PENDINGANIMATIONS_H_ |
#include "sky/engine/core/animation/AnimationPlayer.h" |
#include "sky/engine/platform/Timer.h" |
@@ -43,28 +43,26 @@ namespace blink { |
// For CSS Animations, used to synchronize the start of main-thread animations |
// with compositor animations when both classes of CSS Animations are triggered |
// by the same recalc |
-class CompositorPendingAnimations final { |
+class PendingAnimations final { |
DISALLOW_ALLOCATION(); |
public: |
- CompositorPendingAnimations() |
- : m_timer(this, &CompositorPendingAnimations::timerFired) |
+ PendingAnimations() |
+ : m_timer(this, &PendingAnimations::timerFired) |
{ } |
void add(AnimationPlayer*); |
// Returns whether we are waiting for an animation to start and should |
// service again on the next frame. |
- bool update(bool startOnCompositor = true); |
- void notifyCompositorAnimationStarted(double monotonicAnimationStartTime); |
+ bool update(); |
private: |
- void timerFired(Timer<CompositorPendingAnimations>*) { update(false); } |
+ void timerFired(Timer<PendingAnimations>*) { update(); } |
Vector<RefPtr<AnimationPlayer> > m_pending; |
- Vector<RefPtr<AnimationPlayer> > m_waitingForCompositorAnimationStart; |
- Timer<CompositorPendingAnimations> m_timer; |
+ Timer<PendingAnimations> m_timer; |
}; |
} // namespace blink |
-#endif // SKY_ENGINE_CORE_ANIMATION_COMPOSITORPENDINGANIMATIONS_H_ |
+#endif // SKY_ENGINE_CORE_ANIMATION_PENDINGANIMATIONS_H_ |