Changeset 139635 in webkit

Timestamp:

Jan 14, 2013, 11:45:56 AM (12 years ago)

Author:

simonjam@chromium.org

Message:

Merge 139509

Restore old semantics to webkitRequestAnimationFrame callbacks
​https://bugs.webkit.org/show_bug.cgi?id=106697

Reviewed by James Robinson.

Source/WebCore:

Sites that use GWT <= 2.4 are buggy and rely on Date.now()-like callback values.
We'll restore that behavior to the prefixed version of webkitRequestAnimationFrame.
requestAnimationFrame will continue to follow the spec.

Test: fast/animation/request-animation-frame-prefix.html

• dom/RequestAnimationFrameCallback.h:

(RequestAnimationFrameCallback):

• dom/ScriptedAnimationController.cpp:

(WebCore::ScriptedAnimationController::serviceScriptedAnimations):

• page/DOMWindow.cpp:

(WebCore::DOMWindow::requestAnimationFrame):
(WebCore):
(WebCore::DOMWindow::webkitRequestAnimationFrame):

• page/DOMWindow.h:

(DOMWindow):

• page/DOMWindow.idl:

LayoutTests:

• fast/animation/request-animation-frame-prefix-expected.txt: Added.
• fast/animation/request-animation-frame-prefix.html: Added.
• fast/animation/script-tests/request-animation-frame-prefix.js: Added.

(busyWait):
(window.webkitRequestAnimationFrame):

TBR=​simonjam@chromium.org
Review URL: ​https://codereview.chromium.org/11876026

Location:

branches/chromium/1364

Files:

• LayoutTests/fast/animation/request-animation-frame-prefix-expected.txt (copied) (copied from trunk/LayoutTests/fast/animation/request-animation-frame-prefix-expected.txt )
• LayoutTests/fast/animation/request-animation-frame-prefix.html (copied) (copied from trunk/LayoutTests/fast/animation/request-animation-frame-prefix.html )
• LayoutTests/fast/animation/script-tests/request-animation-frame-prefix.js (copied) (copied from trunk/LayoutTests/fast/animation/script-tests/request-animation-frame-prefix.js )
• Source/WebCore/dom/RequestAnimationFrameCallback.h (modified) (1 diff)
• Source/WebCore/dom/ScriptedAnimationController.cpp (modified) (2 diffs)
• Source/WebCore/page/DOMWindow.cpp (modified) (1 diff)
• Source/WebCore/page/DOMWindow.h (modified) (1 diff)
• Source/WebCore/page/DOMWindow.idl (modified) (1 diff)

branches/chromium/1364/Source/WebCore/dom/RequestAnimationFrameCallback.h

@@ -43 +43 @@
     int m_id;
     bool m_firedOrCancelled;
+    bool m_useLegacyTimeBase;
 };
 

branches/chromium/1364/Source/WebCore/dom/ScriptedAnimationController.cpp

@@ -115 +115 @@
 
     double highResNowMs = 1000.0 * m_document->loader()->timing()->monotonicTimeToZeroBasedDocumentTime(monotonicTimeNow);
+    double legacyHighResNowMs = 1000.0 * m_document->loader()->timing()->monotonicTimeToPseudoWallTime(monotonicTimeNow);
 
     // First, generate a list of callbacks to consider.  Callbacks registered from this point
@@ -129 +130 @@
             callback->m_firedOrCancelled = true;
             InspectorInstrumentationCookie cookie = InspectorInstrumentation::willFireAnimationFrame(m_document, callback->m_id);
-            callback->handleEvent(highResNowMs);
+            if (callback->m_useLegacyTimeBase)
+                callback->handleEvent(legacyHighResNowMs);
+            else
+                callback->handleEvent(highResNowMs);
             InspectorInstrumentation::didFireAnimationFrame(cookie);
         }

branches/chromium/1364/Source/WebCore/page/DOMWindow.cpp

@@ -1550 +1550 @@
 int DOMWindow::requestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> callback)
 {
+    callback->m_useLegacyTimeBase = false;
+    if (Document* d = document())
+        return d->requestAnimationFrame(callback);
+    return 0;
+}
+
+int DOMWindow::webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> callback)
+{
+    callback->m_useLegacyTimeBase = true;
     if (Document* d = document())
         return d->requestAnimationFrame(callback);

branches/chromium/1364/Source/WebCore/page/DOMWindow.h

@@ -265 +265 @@
 #if ENABLE(REQUEST_ANIMATION_FRAME)
         int requestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>);
+        int webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>);
         void cancelAnimationFrame(int id);
 #endif

branches/chromium/1364/Source/WebCore/page/DOMWindow.idl

@@ -217 +217 @@
     [V8MeasureAs=UnprefixedRequestAnimationFrame] long requestAnimationFrame(in [Callback] RequestAnimationFrameCallback callback);
     void cancelAnimationFrame(in long id);
-    [ImplementedAs=requestAnimationFrame, V8MeasureAs=PrefixedRequestAnimationFrame] long webkitRequestAnimationFrame(in [Callback] RequestAnimationFrameCallback callback);
+    [V8MeasureAs=PrefixedRequestAnimationFrame] long webkitRequestAnimationFrame(in [Callback] RequestAnimationFrameCallback callback);
     [ImplementedAs=cancelAnimationFrame] void webkitCancelAnimationFrame(in long id);
     [ImplementedAs=cancelAnimationFrame] void webkitCancelRequestAnimationFrame(in long id); // This is a deprecated alias for webkitCancelAnimationFrame(). Remove this when removing vendor prefix.