Changeset 262718 in webkit

Timestamp:

Jun 8, 2020 8:59:37 AM (4 years ago)

Author:

svillar@igalia.com

Message:

[WebXR] Pass an unsigned long to cancelAnimationCallback() as handle
​https://bugs.webkit.org/show_bug.cgi?id=212529

Reviewed by Youenn Fablet.

The type of the handle returned by XRSession::requestAnimationFrame() was recently changed
to unsigned long from long as there was no point in using signed integers for that. However
we forgot to update the cancelAnimationFrame() in the specs as well as it receives the handle
returned by requestAnimationFrame().

We landed ​https://github.com/immersive-web/webxr/pull/1069 in the WebXR specs so we can now
safely also replace signed by unsigned integers in our implementation.

No new tests as there is no change in functionality.

• Modules/webxr/WebXRSession.cpp:

(WebCore::WebXRSession::cancelAnimationFrame): Use unsigned ids.

• Modules/webxr/WebXRSession.h: Ditto.
• Modules/webxr/WebXRSession.idl: Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webxr/WebXRSession.cpp (modified) (2 diffs)
• Modules/webxr/WebXRSession.h (modified) (2 diffs)
• Modules/webxr/WebXRSession.idl (modified) (1 diff)
• Modules/webxr/XRFrameRequestCallback.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-29  Sergio Villar Senin  <svillar@igalia.com>
+
+        [WebXR] Pass an unsigned long to cancelAnimationCallback() as handle
+        https://bugs.webkit.org/show_bug.cgi?id=212529
+
+        Reviewed by Youenn Fablet.
+
+        The type of the handle returned by XRSession::requestAnimationFrame() was recently changed
+        to unsigned long from long as there was no point in using signed integers for that. However
+        we forgot to update the cancelAnimationFrame() in the specs as well as it receives the handle
+        returned by requestAnimationFrame().
+
+        We landed https://github.com/immersive-web/webxr/pull/1069 in the WebXR specs so we can now
+        safely also replace signed by unsigned integers in our implementation.
+
+        No new tests as there is no change in functionality.
+
+        * Modules/webxr/WebXRSession.cpp:
+        (WebCore::WebXRSession::cancelAnimationFrame): Use unsigned ids.
+        * Modules/webxr/WebXRSession.h: Ditto.
+        * Modules/webxr/WebXRSession.idl: Ditto.
+
 2020-06-01  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/Modules/webxr/WebXRSession.cpp

@@ -192 +192 @@
 
 // https://immersive-web.github.io/webxr/#dom-xrsession-requestanimationframe
-XRFrameRequestCallback::Id WebXRSession::requestAnimationFrame(Ref<XRFrameRequestCallback>&& callback)
+XRFrameRequestCallback::Identifier WebXRSession::requestAnimationFrame(Ref<XRFrameRequestCallback>&& callback)
 {
     // 1. Let session be the target XRSession object.
     // 2. Increment session's animation frame callback identifier by one.
-    XRFrameRequestCallback::Id newId = ++m_nextCallbackId;
+    XRFrameRequestCallback::Identifier newId = ++m_nextCallbackId;
 
     // 3. Append callback to session's list of animation frame callbacks, associated with session's
@@ -210 +210 @@
 
 // https://immersive-web.github.io/webxr/#dom-xrsession-cancelanimationframe
-void WebXRSession::cancelAnimationFrame(int callbackId)
+void WebXRSession::cancelAnimationFrame(XRFrameRequestCallback::Identifier callbackId)
 {
     // 1. Let session be the target XRSession object.

trunk/Source/WebCore/Modules/webxr/WebXRSession.h

@@ -72 +72 @@
     void requestReferenceSpace(XRReferenceSpaceType, RequestReferenceSpacePromise&&);
 
-    XRFrameRequestCallback::Id requestAnimationFrame(Ref<XRFrameRequestCallback>&&);
-    void cancelAnimationFrame(int handle);
+    XRFrameRequestCallback::Identifier requestAnimationFrame(Ref<XRFrameRequestCallback>&&);
+    void cancelAnimationFrame(XRFrameRequestCallback::Identifier handle);
 
     void end(EndPromise&&);
@@ -110 +110 @@
     RefPtr<WebXRRenderState> m_pendingRenderState;
 
-    XRFrameRequestCallback::Id m_nextCallbackId { 0 };
+    XRFrameRequestCallback::Identifier m_nextCallbackId { 0 };
     Vector<Ref<XRFrameRequestCallback>> m_callbacks;
     Vector<Ref<XRFrameRequestCallback>> m_runningCallbacks;

trunk/Source/WebCore/Modules/webxr/WebXRSession.idl

@@ -43 +43 @@
 
     unsigned long requestAnimationFrame(XRFrameRequestCallback callback);
-    void cancelAnimationFrame(long handle);
+    void cancelAnimationFrame(unsigned long handle);
 
     Promise<void> end();

trunk/Source/WebCore/Modules/webxr/XRFrameRequestCallback.h

@@ -42 +42 @@
     virtual CallbackResult<void> handleEvent(double highResTimeMs, WebXRFrame&) = 0;
 
-    using Id = unsigned long;
-    Id callbackId() { ASSERT(m_id); return m_id; }
-    void setCallbackId(Id id) { ASSERT(!m_id); m_id = id; }
+    using Identifier = unsigned long;
+    Identifier callbackId() { ASSERT(m_id); return m_id; }
+    void setCallbackId(Identifier id) { ASSERT(!m_id); m_id = id; }
     void cancel() { m_cancelled = true; }
     bool isCancelled() const { return m_cancelled; }
 
 private:
-    Id m_id { 0 };
+    Identifier m_id { 0 };
     bool m_cancelled { false };
 };