Index: third_party/WebKit/Source/core/animation/AnimationTimeline.h |
diff --git a/third_party/WebKit/Source/core/animation/AnimationTimeline.h b/third_party/WebKit/Source/core/animation/AnimationTimeline.h |
index b88901f10365ba7571bb9d417105e49083262bf2..ef6cb9586643fe42cc383218ce5ebaf07b2f73ac 100644 |
--- a/third_party/WebKit/Source/core/animation/AnimationTimeline.h |
+++ b/third_party/WebKit/Source/core/animation/AnimationTimeline.h |
@@ -55,7 +55,6 @@ public: |
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() { } |
@@ -72,6 +71,7 @@ public: |
void animationAttached(Animation&); |
+ bool isActive(); |
bool hasPendingUpdates() const { return !m_animationsNeedingUpdate.isEmpty(); } |
double zeroTime(); |
double currentTime(bool& isNull); |
@@ -99,6 +99,7 @@ public: |
void detachFromDocument(); |
#endif |
void wake(); |
+ void resetForTesting(); |
DECLARE_TRACE(); |
@@ -135,7 +136,6 @@ private: |
} |
void wakeAfter(double duration) override; |
- void cancelWake() override; |
void serviceOnNextFrame() override; |
void timerFired(Timer<AnimationTimelineTiming>*) { m_timeline->wake(); } |