Changeset 272014 in webkit

Timestamp:

Jan 28, 2021, 8:32:49 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (r271988): XRSession.end() promise is not resolved if PlatformXR::Device::supportsSessionShutdownNotification() returns false
​https://bugs.webkit.org/show_bug.cgi?id=221080

Patch by Ada Chan <​ada.chan@apple.com> on 2021-01-28
Reviewed by Chris Dumez.

Source/WebCore:

m_endPromise needs to be set before WebXRSession::shutdown() is called
since that can call WebXRSession::didCompleteShutdown() which will
resolve m_endPromise.

This issue caused a timeout in the cleanup step for a test like
imported/w3c/web-platform-tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html.

• Modules/webxr/WebXRSession.cpp:

(WebCore::WebXRSession::end):

LayoutTests:

Enable a test that was timing out, but now passes with the bug fix.

• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webxr/WebXRSession.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-28  Ada Chan  <ada.chan@apple.com>
+
+        REGRESSION (r271988): XRSession.end() promise is not resolved if PlatformXR::Device::supportsSessionShutdownNotification() returns false
+        https://bugs.webkit.org/show_bug.cgi?id=221080
+
+        Reviewed by Chris Dumez.
+
+        Enable a test that was timing out, but now passes with the bug fix.
+
+        * platform/mac/TestExpectations:
+
 2021-01-28  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -2261 +2261 @@
 # WebXR tests
 [ BigSur+ ] imported/w3c/web-platform-tests/webxr/xrSession_end.https.html [ Pass ]
+[ BigSur+ ] imported/w3c/web-platform-tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html [ Pass ]
 [ BigSur+ ] http/wpt/webxr [ Pass ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-28  Ada Chan  <ada.chan@apple.com>
+
+        REGRESSION (r271988): XRSession.end() promise is not resolved if PlatformXR::Device::supportsSessionShutdownNotification() returns false
+        https://bugs.webkit.org/show_bug.cgi?id=221080
+
+        Reviewed by Chris Dumez.
+
+        m_endPromise needs to be set before WebXRSession::shutdown() is called
+        since that can call WebXRSession::didCompleteShutdown() which will
+        resolve m_endPromise.
+
+        This issue caused a timeout in the cleanup step for a test like
+        imported/w3c/web-platform-tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html.
+
+        * Modules/webxr/WebXRSession.cpp:
+        (WebCore::WebXRSession::end):
+
 2021-01-28  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -391 +391 @@
         return Exception { InvalidStateError, "Cannot end a session more than once"_s };
 
+    ASSERT(!m_endPromise);
+    m_endPromise = WTFMove(promise);
+
     // 1. Let promise be a new Promise.
     // 2. Shut down the target XRSession object.
@@ -398 +401 @@
     // 3.1 Wait until any platform-specific steps related to shutting down the session have completed.
     // 3.2 Resolve promise.
-    ASSERT(!m_endPromise);
-    m_endPromise = WTFMove(promise);
-
     // 4. Return promise.
     return { };