diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-11-20 16:37:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-20 16:37:35 -0500 |
commit | eb363ec8ae00c2212c76d8d828cec3a4b8a504d8 (patch) | |
tree | f0e44cc9e74e95f6f632060b69532661605a0df5 | |
parent | dc22a78cc28a06e4192414974722748a034c93f1 (diff) | |
parent | b816c0ff683a162b337cf7528a87354f8b516216 (diff) | |
download | servo-eb363ec8ae00c2212c76d8d828cec3a4b8a504d8.tar.gz servo-eb363ec8ae00c2212c76d8d828cec3a4b8a504d8.zip |
Auto merge of #24777 - servo:jdm-patch-34, r=Manishearth
Enable webxr by default
This changes two things:
* enable WebXR by default, since it's not exactly an experimental technology in Servo anymore
* enable the glwindow webxr backend by default so it's easier to test WebXR on desktop nightlies
Since the glwindow pref is only checked in the glutin desktop port, enabling it for other ports does not hurt us at all and it removes a papercut for testing WebXR content on desktop.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24777)
<!-- Reviewable:end -->
-rw-r--r-- | resources/prefs.json | 4 | ||||
-rw-r--r-- | tests/wpt/metadata/webvr/__dir__.ini | 2 | ||||
-rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 2 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/mozilla/interfaces.html | 16 | ||||
-rw-r--r-- | tests/wpt/webgl/meta/conformance/context/methods.html.ini | 5 |
5 files changed, 24 insertions, 5 deletions
diff --git a/resources/prefs.json b/resources/prefs.json index 9139c55c36e..d715ffab76f 100644 --- a/resources/prefs.json +++ b/resources/prefs.json @@ -30,8 +30,8 @@ "dom.webvr.enabled": false, "dom.webvr.event_polling_interval": 500, "dom.webvr.test": false, - "dom.webxr.enabled": false, - "dom.webxr.glwindow": false, + "dom.webxr.enabled": true, + "dom.webxr.glwindow": true, "dom.webxr.test": false, "dom.worklet.timeout_ms": 10, "gfx.subpixel-text-antialiasing.enabled": true, diff --git a/tests/wpt/metadata/webvr/__dir__.ini b/tests/wpt/metadata/webvr/__dir__.ini index d202f6efd61..45ce97d1e34 100644 --- a/tests/wpt/metadata/webvr/__dir__.ini +++ b/tests/wpt/metadata/webvr/__dir__.ini @@ -1 +1 @@ -prefs: ["dom.gamepad.enabled:true", "dom.webvr.enabled:true"] +prefs: ["dom.gamepad.enabled:true", "dom.webvr.enabled:true", "dom.webxr.enabled:false"] diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 409d33b4c58..b1babc8b119 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -19023,7 +19023,7 @@ "testharness" ], "mozilla/interfaces.html": [ - "f1d58732adafef4afc9f9b7f16d6961e4b74a5e9", + "08e8181e6e639caeaecd84c16d582c0ec3f99474", "testharness" ], "mozilla/interfaces.js": [ diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html index f1d58732ada..08e8181e6e6 100644 --- a/tests/wpt/mozilla/tests/mozilla/interfaces.html +++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html @@ -259,6 +259,22 @@ test_interfaces([ "XMLHttpRequestEventTarget", "XMLHttpRequestUpload", "XMLSerializer", + "XR", + "XRFrame", + "XRInputSource", + "XRInputSourceArray", + "XRInputSourceEvent", + "XRPose", + "XRReferenceSpace", + "XRRenderState", + "XRRigidTransform", + "XRSession", + "XRSessionEvent", + "XRSpace", + "XRView", + "XRViewerPose", + "XRViewport", + "XRWebGLLayer", "console", ]); </script> diff --git a/tests/wpt/webgl/meta/conformance/context/methods.html.ini b/tests/wpt/webgl/meta/conformance/context/methods.html.ini index 3869ed06101..281cbb288e0 100644 --- a/tests/wpt/webgl/meta/conformance/context/methods.html.ini +++ b/tests/wpt/webgl/meta/conformance/context/methods.html.ini @@ -2,4 +2,7 @@ bug: https://github.com/servo/servo/issues/15266 [WebGL test #0: Property either does not exist or is not a function: isContextLost] expected: FAIL - + [WebGL test #1: Also found the following extra methods:] + expected: FAIL + [WebGL test #2: makeXRCompatible] + expected: FAIL |