diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:56:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:57:30 +0200 |
| commit | b297e0fa5c217c9467033b7c8b46891a52870120 (patch) | |
| tree | 43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebCore/dom/ScriptedAnimationController.h | |
| parent | 69d517dbfa69903d8593cc1737f0474b21e3251e (diff) | |
| download | qtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz | |
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.
Caused OOM issues on some CI machines :(
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 + |