| Index: Source/core/animation/css/CSSPendingAnimations.h
|
| diff --git a/Source/core/animation/css/CSSPendingAnimations.h b/Source/core/animation/css/CSSPendingAnimations.h
|
| index 432e403d7cdf34b88dd33cdd956650364c868f43..46890857096fc68f071591a388a23df925769073 100644
|
| --- a/Source/core/animation/css/CSSPendingAnimations.h
|
| +++ b/Source/core/animation/css/CSSPendingAnimations.h
|
| @@ -40,13 +40,15 @@ namespace WebCore {
|
| // animations when both classes of CSS Animations are triggered by the same recalc
|
| class CSSPendingAnimations FINAL {
|
| public:
|
| - void add(Player* player) { m_pending.append(player); };
|
| - void startPendingAnimations();
|
| + void add(Player*);
|
| + void startPendingAnimationsAfterStyleRecalc();
|
| + void startPendingAnimationsAfterCompositingUpdate();
|
| void notifyCompositorAnimationStarted(double monotonicAnimationStartTime);
|
|
|
| private:
|
| - Vector<RefPtr<Player> > m_pending;
|
| + Vector<std::pair<RefPtr<Player>, double> > m_pending;
|
| Vector<RefPtr<Player> > m_waitingForCompositorAnimationStart;
|
| + double m_pendingTime;
|
| };
|
|
|
| } // namespace WebCore
|
|
|