Changeset 272492 in webkit

Timestamp:

Feb 8, 2021 8:17:03 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

WebXRSystem::RequestSession with 'viewer' as a required feature should succeed
​https://bugs.webkit.org/show_bug.cgi?id=221267

Patch by Imanol Fernandez <imanol> on 2021-02-08
Reviewed by Sergio Villar Senin.

LayoutTests/imported/w3c:

Mark xrSession_viewer_availability test as passing.

• web-platform-tests/webxr/xrSession_viewer_availability.https-expected.txt: Added.

Source/WebCore:

Tested by wpt/webxr/xrSession_viewer_availability.html

• Modules/webxr/WebXRSystem.cpp:

(WebCore::WebXRSystem::inlineSessionRequestIsAllowedForGlobalObject const):

LayoutTests:

Mark xrSession_viewer_availability test as passing.

• platform/wpe/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/webxr/xrSession_viewer_availability.https-expected.txt (added)
• LayoutTests/platform/wpe/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webxr/WebXRSystem.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-02-08  Imanol Fernandez  <ifernandez@igalia.com>
+
+        WebXRSystem::RequestSession with 'viewer' as a required feature should succeed
+        https://bugs.webkit.org/show_bug.cgi?id=221267
+
+        Reviewed by Sergio Villar Senin.
+
+        Mark xrSession_viewer_availability test as passing.
+
+        * platform/wpe/TestExpectations:
+
 2021-02-08  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-02-08  Imanol Fernandez  <ifernandez@igalia.com>
+
+        WebXRSystem::RequestSession with 'viewer' as a required feature should succeed
+        https://bugs.webkit.org/show_bug.cgi?id=221267
+
+        Reviewed by Sergio Villar Senin.
+
+        Mark xrSession_viewer_availability test as passing.
+
+        * web-platform-tests/webxr/xrSession_viewer_availability.https-expected.txt: Added.
+
 2021-02-06  Alex Christensen  <achristensen@webkit.org>
 

trunk/LayoutTests/platform/wpe/TestExpectations

@@ -642 +642 @@
 webkit.org/b/209859 imported/w3c/web-platform-tests/webxr/xrSession_requestAnimationFrame_callback_calls.https.html [ Pass ]
 webkit.org/b/209859 imported/w3c/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html [ Pass ]
+imported/w3c/web-platform-tests/webxr/xrSession_viewer_availability.https.html [ Pass ]
 webkit.org/b/209859 imported/w3c/web-platform-tests/webxr/ar-module/idlharness.https.window.html [ Pass ]
 webkit.org/b/209859 imported/w3c/web-platform-tests/webxr/ar-module/xrDevice_isSessionSupported_immersive-ar.https.html [ Pass ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-08  Imanol Fernandez  <ifernandez@igalia.com>
+
+        WebXRSystem::RequestSession with 'viewer' as a required feature should succeed
+        https://bugs.webkit.org/show_bug.cgi?id=221267
+
+        Reviewed by Sergio Villar Senin.
+
+        Tested by wpt/webxr/xrSession_viewer_availability.html
+
+        * Modules/webxr/WebXRSystem.cpp:
+        (WebCore::WebXRSystem::inlineSessionRequestIsAllowedForGlobalObject const):
+
 2021-02-08  Imanol Fernandez  <ifernandez@igalia.com>
 

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

@@ -205 +205 @@
 bool WebXRSystem::inlineSessionRequestIsAllowedForGlobalObject(DOMWindow& globalObject, Document& document, const XRSessionInit& init) const
 {
-    // 1. If the session request contained any required features or optional features and the request was not made
+    auto isEmptyOrViewer = [&document](const JSFeaturesArray& features) {
+        if (features.isEmpty())
+            return true;
+        if (features.size() == 1) {
+            auto feature = parseEnumeration<XRReferenceSpaceType>(*document.globalObject(), features.first());
+            if (feature == XRReferenceSpaceType::Viewer)
+                return true;
+        }
+        return false;
+    };
+
+    // 1. If the session request contained any required features or optional features (besides 'viewer') and the request was not made
     //    while the global object has transient activation or when launching a web application, return false.
-    bool sessionRequestContainedAnyFeature = !init.optionalFeatures.isEmpty() || !init.requiredFeatures.isEmpty();
+    bool sessionRequestContainedAnyFeature = !isEmptyOrViewer(init.optionalFeatures) || !isEmptyOrViewer(init.requiredFeatures);
     if (sessionRequestContainedAnyFeature && !globalObject.hasTransientActivation() /* TODO: || !launching a web app */)
         return false;