Web Animations: Use a single animation clock

third_party/WebKit/Source/core/animation/AnimationTimeline.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 37 matching lines @@
 class AnimationEffect;
 
 // AnimationTimeline is constructed and owned by Document, and tied to its lifecycle.
 class CORE_EXPORT AnimationTimeline : public GarbageCollectedFinalized<AnimationTimeline>, public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
     class PlatformTiming : public GarbageCollectedFinalized<PlatformTiming> {
     public:
         // Calls AnimationTimeline's wake() method after duration seconds.
         virtual void wakeAfter(double duration) = 0;
-        virtual void cancelWake() = 0;
         virtual void serviceOnNextFrame() = 0;
         virtual ~PlatformTiming() { }
         DEFINE_INLINE_VIRTUAL_TRACE() { }
     };
 
     static AnimationTimeline* create(Document*, PlatformTiming* = nullptr);
     ~AnimationTimeline();
 
     void serviceAnimations(TimingUpdateReason);
     void scheduleNextService();
 
     Animation* play(AnimationEffect*);
     HeapVector<Member<Animation>> getAnimations();
 
     void animationAttached(Animation&);
 
+    bool isActive();
     bool hasPendingUpdates() const { return !m_animationsNeedingUpdate.isEmpty(); }
     double zeroTime();
     double currentTime(bool& isNull);
     double currentTime();
     double currentTimeInternal(bool& isNull);
     double currentTimeInternal();
     void setCurrentTime(double);
     void setCurrentTimeInternal(double);
     double effectiveTime();
     void pauseAnimationsForTesting(double);
 
     void setAllCompositorPending(bool sourceChanged = false);
     void setOutdatedAnimation(Animation*);
     void clearOutdatedAnimation(Animation*);
     bool hasOutdatedAnimation() const { return m_outdatedAnimationCount > 0; }
     bool needsAnimationTimingUpdate();
 
     void setPlaybackRate(double);
     double playbackRate() const;
 
     WebCompositorAnimationTimeline* compositorTimeline() const { return m_compositorTimeline.get(); }
 
     Document* document() { return m_document.get(); }
 #if !ENABLE(OILPAN)
     void detachFromDocument();
 #endif
     void wake();
+    void resetForTesting();
 
     DECLARE_TRACE();
 
 protected:
     AnimationTimeline(Document*, PlatformTiming*);
 
 private:
     RawPtrWillBeMember<Document> m_document;
     double m_zeroTime;
     bool m_zeroTimeInitialized;
@@ skipping 16 matching lines @@
     class AnimationTimelineTiming final : public PlatformTiming {
     public:
         AnimationTimelineTiming(AnimationTimeline* timeline)
             : m_timeline(timeline)
             , m_timer(this, &AnimationTimelineTiming::timerFired)
         {
             ASSERT(m_timeline);
         }
 
         void wakeAfter(double duration) override;
-        void cancelWake() override;
         void serviceOnNextFrame() override;
 
         void timerFired(Timer<AnimationTimelineTiming>*) { m_timeline->wake(); }
 
         DECLARE_VIRTUAL_TRACE();
 
     private:
         Member<AnimationTimeline> m_timeline;
         Timer<AnimationTimelineTiming> m_timer;
     };
 
     friend class AnimationAnimationTimelineTest;
 };
 
 } // namespace blink
 
 #endif