Check requested reference space against enabled XR session features

Currently we only check if the requested reference space is supported by the device before resolving the request. With more detailed consent this is no longer sufficient, we need to also check the underlying feature of the reference space against which features have been enabled. This CL also does some minor refactoring of code related to XRSessionFeature. Bug: 985095 Change-Id: Ibe6ecadbc6ce25c523eb4ee9d8a73560d8580df5
web-platform-tests · Aug 16, 2019 · 5fc3ddc · 5fc3ddc
1 parent 6a439fd
commit 5fc3ddc
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 9 deletions.
diff --git a/webxr/events_referenceSpace_reset.https.html b/webxr/events_referenceSpace_reset.https.html
@@ -50,6 +50,8 @@
 xr_session_promise_test(
   immersiveTestName, testFunction, fakeDeviceInitParams, 'immersive-vr');
 xr_session_promise_test(
-  nonImmersiveTestName, testFunction, fakeDeviceInitParams, 'inline');
+  nonImmersiveTestName, testFunction, fakeDeviceInitParams, 'inline', {
+    'requiredFeatures': ['local'],
+  });
 
 </script>
diff --git a/webxr/xrBoundedReferenceSpace_updates.https.html b/webxr/xrBoundedReferenceSpace_updates.https.html
@@ -58,6 +58,6 @@
     });
 };
 
-xr_session_promise_test(testName, testFunction, fakeDeviceInitParams, 'immersive-vr');
+xr_session_promise_test(testName, testFunction, fakeDeviceInitParams, 'immersive-vr', { 'requiredFeatures': ['bounded-floor'] });
 
 </script>
diff --git a/webxr/xrFrame_getPose.https.html b/webxr/xrFrame_getPose.https.html
@@ -77,6 +77,6 @@
 xr_session_promise_test(immersiveTestName, testFunction,
   fakeDeviceInitParams, 'immersive-vr');
 xr_session_promise_test(nonImmersiveTestName, testFunction,
-  fakeDeviceInitParams, 'inline');
+  fakeDeviceInitParams, 'inline', { 'requiredFeatures': ['local'] });
 
 </script>
diff --git a/webxr/xrFrame_lifetime.https.html b/webxr/xrFrame_lifetime.https.html
@@ -52,7 +52,7 @@
     xr_session_promise_test(immersiveTestName, testFunction,
       fakeDeviceInitParams, 'immersive-vr');
     xr_session_promise_test(nonImmersiveTestName, testFunction,
-      fakeDeviceInitParams, 'inline');
+      fakeDeviceInitParams, 'inline', { 'requiredFeatures': ['local'] });
 
   </script>
 </body>
diff --git a/webxr/xrReferenceSpace_originOffsetBounded.https.html b/webxr/xrReferenceSpace_originOffsetBounded.https.html
@@ -239,6 +239,6 @@
 };
 
 xr_session_promise_test(
-  testName, testFunction, fakeDeviceInitParams, 'immersive-vr');
+  testName, testFunction, fakeDeviceInitParams, 'immersive-vr', { 'requiredFeatures': ['bounded-floor'] });
 
 </script>
diff --git a/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html b/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html
@@ -68,7 +68,7 @@
     };
 
     xr_session_promise_test(nonImmersiveTestName, testFunction,
-      fakeDeviceInitParams, 'inline');
+      fakeDeviceInitParams, 'inline', { 'requiredFeatures': ['local'] });
     xr_session_promise_test(immersiveTestName, testFunction,
       fakeDeviceInitParams, 'immersive-vr');
 

diff --git a/webxr/xrSession_requestAnimationFrame_timestamp.https.html b/webxr/xrSession_requestAnimationFrame_timestamp.https.html
@@ -87,6 +87,6 @@
 xr_session_promise_test(
   immersiveTestName, testFunction, fakeDeviceInitParams, 'immersive-vr');
 xr_session_promise_test(
-  nonImmersiveTestName, testFunction, fakeDeviceInitParams, 'inline');
+  nonImmersiveTestName, testFunction, fakeDeviceInitParams, 'inline', { 'requiredFeatures': ['local'] });
 
 </script>
diff --git a/webxr/xrSession_requestReferenceSpace_features.https.html b/webxr/xrSession_requestReferenceSpace_features.https.html
@@ -38,6 +38,12 @@
     xr_session_promise_test(
         "Immersive session supports local space by default",
         makeSpaceTest('local'), fakeDeviceInitParams, 'immersive-vr', {});
+    xr_session_promise_test(
+        "Immersive AR session supports viewer space by default",
+        makeSpaceTest('viewer'), fakeDeviceInitParams, 'immersive-ar', {});
+    xr_session_promise_test(
+        "Immersive AR session supports local space by default",
+        makeSpaceTest('local'), fakeDeviceInitParams, 'immersive-ar', {});
 
     // Test that session-appropriate non-default reference spaces work when requested
     xr_session_promise_test(
@@ -60,6 +66,14 @@
         "Immersive session supports local-floor space when optional",
         makeSpaceTest('local-floor'), fakeDeviceInitParams, 'immersive-vr',
         {optionalFeatures: ['local-floor']});
+    xr_session_promise_test(
+        "Immersive AR session supports local-floor space when required",
+        makeSpaceTest('local-floor'), fakeDeviceInitParams, 'immersive-ar',
+        {requiredFeatures: ['local-floor']});
+    xr_session_promise_test(
+        "Immersive AR session supports local-floor space when optional",
+        makeSpaceTest('local-floor'), fakeDeviceInitParams, 'immersive-ar',
+        {optionalFeatures: ['local-floor']});
 
     // Test that inline space can't request 'bounded-floor' or 'unbounded'
     xr_session_promise_test(

diff --git a/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html b/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html
@@ -64,7 +64,7 @@
     }));
 };
 
-xr_session_promise_test(immersiveTestName, testFunction, fakeDeviceInitParams, 'immersive-vr');
-xr_session_promise_test(nonImmersiveTestName, testFunction, fakeDeviceInitParams, 'inline');
+xr_session_promise_test(immersiveTestName, testFunction, fakeDeviceInitParams, 'immersive-vr', { 'requiredFeatures': ['local-floor'] });
+xr_session_promise_test(nonImmersiveTestName, testFunction, fakeDeviceInitParams, 'inline', { 'requiredFeatures': ['local-floor'] });
 
 </script>