summaryrefslogtreecommitdiff
path: root/Source/WebCore/dom/ScriptedAnimationController.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/dom/ScriptedAnimationController.h')
-rw-r--r--Source/WebCore/dom/ScriptedAnimationController.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebCore/dom/ScriptedAnimationController.h b/Source/WebCore/dom/ScriptedAnimationController.h
index 450a87b46..51c36b994 100644
--- a/Source/WebCore/dom/ScriptedAnimationController.h
+++ b/Source/WebCore/dom/ScriptedAnimationController.h
@@ -61,7 +61,7 @@ public:
CallbackId registerCallback(PassRefPtr<RequestAnimationFrameCallback>);
void cancelCallback(CallbackId);
- void serviceScriptedAnimations(double monotonicTimeNow);
+ void serviceScriptedAnimations(DOMTimeStamp);
void suspend();
void resume();
@@ -70,7 +70,7 @@ public:
private:
ScriptedAnimationController(Document*, PlatformDisplayID);
-
+
typedef Vector<RefPtr<RequestAnimationFrameCallback> > CallbackList;
CallbackList m_callbacks;
@@ -83,11 +83,11 @@ private:
#if USE(REQUEST_ANIMATION_FRAME_TIMER)
void animationTimerFired(Timer<ScriptedAnimationController>*);
Timer<ScriptedAnimationController> m_animationTimer;
- double m_lastAnimationFrameTimeMonotonic;
+ double m_lastAnimationFrameTime;
#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
// Override for DisplayRefreshMonitorClient
- virtual void displayRefreshFired(double timestamp);
+ virtual void displayRefreshFired(double timestamp) { serviceScriptedAnimations(convertSecondsToDOMTimeStamp(timestamp)); }
bool m_useTimer;
#endif
@@ -99,3 +99,4 @@ private:
#endif // ENABLE(REQUEST_ANIMATION_FRAME)
#endif // ScriptedAnimationController_h
+