diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/WebCore/dom/ScriptedAnimationController.h | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
| download | qtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/WebCore/dom/ScriptedAnimationController.h')
| -rw-r--r-- | Source/WebCore/dom/ScriptedAnimationController.h | 9 |
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 + |