Bug 1631948 [wpt PR 23153] - Fix Webxr WPTs, a=testonly
authorAlexander Cooper <alcooper@chromium.org>
Tue, 28 Apr 2020 11:35:53 +0000
changeset 527554 aa9237f94e6fa8451dc7ce09471a6e80d09b8323
parent 527553 880e5158d0f65527e1b61be6e5850316128ba906
child 527555 fdfdeaafaa3ea6cd8883bc904cd1fdab533b22e9
push id37368
push userbtara@mozilla.com
push dateFri, 01 May 2020 21:45:51 +0000
treeherdermozilla-central@0f9c5a59e45d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1631948, 23153, 1072929, 2159320, 761158
milestone77.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1631948 [wpt PR 23153] - Fix Webxr WPTs, a=testonly Automatic update from web-platform-tests Fix Webxr WPTs The "is webkit" heuristic only checks that self.internals exists; however, this is also true on chromium. Chromium however does not have an "internals.xrTest", this expands the "is webkit" heuristic to also account for the presence of "internals.xrTest" and thus ensure chromium tests run Fixed: 1072929 Change-Id: Ieba043ba1634b393905e4494d0c59294aa6df12b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159320 Commit-Queue: Alexander Cooper <alcooper@chromium.org> Auto-Submit: Alexander Cooper <alcooper@chromium.org> Reviewed-by: Brandon Jones <bajones@chromium.org> Reviewed-by: Klaus Weidner <klausw@chromium.org> Cr-Commit-Position: refs/heads/master@{#761158} -- wpt-commits: ef350cb9bd09615e8519a6d3ce08b478e4961207 wpt-pr: 23153
testing/web-platform/tests/webxr/resources/webxr_util.js
--- a/testing/web-platform/tests/webxr/resources/webxr_util.js
+++ b/testing/web-platform/tests/webxr/resources/webxr_util.js
@@ -201,17 +201,17 @@ let loadChromiumResources = Promise.reso
                          }));
       document.head.appendChild(script);
   });
 
   return chain;
 });
 
 let setupWebKitWebXRTestAPI = Promise.resolve().then(() => {
-  if (!self.internals) {
+  if (!self.internals || !internals.xrTest) {
     // 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;