Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: Source/WebCore/dom/ScriptedAnimationController.h

Issue 10391049: Merge 116319 - Unreviewed, rolling out r115525. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/dom/ScriptedAnimationController.h
===================================================================
--- Source/WebCore/dom/ScriptedAnimationController.h (revision 116642)
+++ Source/WebCore/dom/ScriptedAnimationController.h (working copy)
@@ -61,7 +61,7 @@
CallbackId registerCallback(PassRefPtr<RequestAnimationFrameCallback>);
void cancelCallback(CallbackId);
- void serviceScriptedAnimations(double monotonicTimeNow);
+ void serviceScriptedAnimations(DOMTimeStamp);
void suspend();
void resume();
@@ -70,7 +70,7 @@
private:
ScriptedAnimationController(Document*, PlatformDisplayID);
-
+
typedef Vector<RefPtr<RequestAnimationFrameCallback> > CallbackList;
CallbackList m_callbacks;
@@ -83,11 +83,11 @@
#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 @@
#endif // ENABLE(REQUEST_ANIMATION_FRAME)
#endif // ScriptedAnimationController_h
+
« no previous file with comments | « Source/WebCore/dom/RequestAnimationFrameCallback.idl ('k') | Source/WebCore/dom/ScriptedAnimationController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698