Changeset 260424 in webkit

Timestamp:

Apr 21, 2020 3:33:58 AM (4 years ago)

Author:

svillar@igalia.com

Message:

Import latest changes from web-platform-test/webxr/resources to enable testing in WebKit
​https://bugs.webkit.org/show_bug.cgi?id=210788

Reviewed by Žan Doberšek.

We landed in wpt new code in webxr_utils.js to map internal.xrTest to
navigator.xr.test to be able to run WebXR WPT in WebKit. Import those changes
from upstream in order to be able to run the tests.

Apart from that we take the chance to import the latest fixes to the
files in resources/ directory.

• web-platform-tests/webxr/resources/webxr_test_constants.js: Updated.
• web-platform-tests/webxr/resources/webxr_test_constants_fake_world.js:

(createFakeWorld): Ditto.

• web-platform-tests/webxr/resources/webxr_util.js: Map internals.xrTest

to navigator.xr.test for WebKit browsers.
(xr_debug): Updated.
(async xr_session_promise_test): Ditto.
(xr_promise_test): Deleted.

Location:

trunk/LayoutTests/imported/w3c

Files:

• ChangeLog (modified) (1 diff)
• web-platform-tests/webxr/resources/webxr_test_constants.js (modified) (1 diff)
• web-platform-tests/webxr/resources/webxr_test_constants_fake_world.js (modified) (1 diff)
• web-platform-tests/webxr/resources/webxr_util.js (modified) (5 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-04-21  Sergio Villar Senin  <svillar@igalia.com>
+
+        Import latest changes from web-platform-test/webxr/resources to enable testing in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=210788
+
+        Reviewed by Žan Doberšek.
+
+        We landed in wpt new code in webxr_utils.js to map internal.xrTest to
+        navigator.xr.test to be able to run WebXR WPT in WebKit. Import those changes
+        from upstream in order to be able to run the tests.
+
+        Apart from that we take the chance to import the latest fixes to the
+        files in resources/ directory.
+
+        * web-platform-tests/webxr/resources/webxr_test_constants.js: Updated.
+        * web-platform-tests/webxr/resources/webxr_test_constants_fake_world.js:
+        (createFakeWorld): Ditto.
+        * web-platform-tests/webxr/resources/webxr_util.js: Map internals.xrTest 
+        to navigator.xr.test for WebKit browsers.
+        (xr_debug): Updated.
+        (async xr_session_promise_test): Ditto.
+        (xr_promise_test): Deleted.
+
 2020-04-15  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_test_constants.js

@@ -129 +129 @@
   'hit-test',
   'dom-overlay',
+  'light-estimation',
 ];
 

trunk/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_test_constants_fake_world.js

@@ -30 +30 @@
   const FRONT_WALL_AND_FLOOR_FACES = [
     // Front wall:
-    [BOTTOM_LEFT_FRONT, BOTTOM_RIGHT_FRONT, TOP_RIGHT_FRONT],
-    [BOTTOM_LEFT_FRONT, TOP_RIGHT_FRONT, TOP_LEFT_FRONT],
+    { vertices: [BOTTOM_LEFT_FRONT, BOTTOM_RIGHT_FRONT, TOP_RIGHT_FRONT] },
+    { vertices: [BOTTOM_LEFT_FRONT, TOP_RIGHT_FRONT, TOP_LEFT_FRONT] },
     // Floor:
-    [BOTTOM_LEFT_FRONT, BOTTOM_RIGHT_FRONT, BOTTOM_RIGHT_BACK],
-    [BOTTOM_LEFT_FRONT, BOTTOM_LEFT_BACK, BOTTOM_RIGHT_BACK],
+    { vertices: [BOTTOM_LEFT_FRONT, BOTTOM_RIGHT_FRONT, BOTTOM_RIGHT_BACK] },
+    { vertices: [BOTTOM_LEFT_FRONT, BOTTOM_LEFT_BACK, BOTTOM_RIGHT_BACK] },
   ];
 
   const CEILING_FACES = [
     // Ceiling:
-    [TOP_LEFT_FRONT, TOP_RIGHT_FRONT, TOP_RIGHT_BACK],
-    [TOP_LEFT_FRONT, TOP_LEFT_BACK, TOP_RIGHT_BACK],
+    { vertices: [TOP_LEFT_FRONT, TOP_RIGHT_FRONT, TOP_RIGHT_BACK] },
+    { vertices: [TOP_LEFT_FRONT, TOP_LEFT_BACK, TOP_RIGHT_BACK] },
   ];
 
   const SIDE_WALLS_FACES = [
     // Left:
-    [BOTTOM_LEFT_FRONT, TOP_LEFT_FRONT, TOP_LEFT_BACK],
-    [BOTTOM_LEFT_FRONT, BOTTOM_LEFT_BACK, TOP_LEFT_BACK],
+    { vertices: [BOTTOM_LEFT_FRONT, TOP_LEFT_FRONT, TOP_LEFT_BACK] },
+    { vertices: [BOTTOM_LEFT_FRONT, BOTTOM_LEFT_BACK, TOP_LEFT_BACK] },
     // Right:
-    [BOTTOM_RIGHT_FRONT, TOP_RIGHT_FRONT, TOP_RIGHT_BACK],
-    [BOTTOM_RIGHT_FRONT, BOTTOM_RIGHT_BACK, TOP_RIGHT_BACK],
+    { vertices: [BOTTOM_RIGHT_FRONT, TOP_RIGHT_FRONT, TOP_RIGHT_BACK] },
+    { vertices: [BOTTOM_RIGHT_FRONT, BOTTOM_RIGHT_BACK, TOP_RIGHT_BACK] },
   ];
 

trunk/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_util.js

@@ -8 +8 @@
 //   --enable-blink-features=MojoJS,MojoJSTest
 
+// Debugging message helper, by default does nothing. Implementations can
+// override this.
+var xr_debug = function(name, msg) {}
+
 function xr_promise_test(name, func, properties) {
   promise_test(async (t) => {
     // Perform any required test setup:
+    xr_debug(name, 'setup');
 
     if (window.XRTest === undefined) {
       // Chrome setup
       await loadChromiumResources;
+      xr_debug = navigator.xr.test.Debug;
+    }
+
+    if (self.internals && internals.xrTest && navigator.xr) {
+      // WebKit setup
+      await setupWebKitWebXRTestAPI;
     }
 
@@ -23 +34 @@
     t.add_cleanup(async () => {
       // Ensure system state is cleaned up.
+      xr_debug(name, 'cleanup');
       await navigator.xr.test.disconnectAllDevices();
     });
 
+    xr_debug(name, 'main');
     return func(t);
   }, name, properties);
@@ -75 +88 @@
               .then(() => new Promise((resolve, reject) => {
                       // Perform the session request in a user gesture.
+                      xr_debug(name, 'simulateUserActivation');
                       navigator.xr.test.simulateUserActivation(() => {
+                        xr_debug(name, 'document.hasFocus()=' + document.hasFocus());
                         navigator.xr.requestSession(sessionMode, sessionInit || {})
                             .then((session) => {
+                              xr_debug(name, 'session start');
                               testSession = session;
                               session.mode = sessionMode;
@@ -88 +104 @@
                               });
                               sessionObjects.glLayer = glLayer;
+                              xr_debug(name, 'session.visibilityState=' + session.visibilityState);
                               resolve(func(session, testDeviceController, t, sessionObjects));
                             })
                             .catch((err) => {
+                              xr_debug(name, 'error: ' + err);
                               reject(
                                   'Session with params ' +
@@ -187 +205 @@
   return chain;
 });
+
+let setupWebKitWebXRTestAPI = Promise.resolve().then(() => {
+  if (!self.internals) {
+    // Do nothing on non-WebKit-based browsers.
+    return;
+  }
+
+  // WebKit setup. The internals object is used by the WebKit test runner
+  // to provide JS access to internal APIs. In this case it's used to
+  // ensure that XRTest is only exposed to wpt tests.
+  navigator.xr.test = internals.xrTest;
+  return Promise.resolve();
+});