Merge 116319 - Unreviewed, rolling out r115525.

Source/WebCore/dom/ScriptedAnimationController.h

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
+