Skip to content

Commit

Permalink
Auto merge of #24777 - servo:jdm-patch-34, r=Manishearth
Browse files Browse the repository at this point in the history
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 -->
  • Loading branch information
bors-servo committed Nov 20, 2019
2 parents dc22a78 + b816c0f commit eb363ec
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 5 deletions.
4 changes: 2 additions & 2 deletions resources/prefs.json
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion 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"]
2 changes: 1 addition & 1 deletion tests/wpt/mozilla/meta/MANIFEST.json
Expand Up @@ -19023,7 +19023,7 @@
"testharness"
],
"mozilla/interfaces.html": [
"f1d58732adafef4afc9f9b7f16d6961e4b74a5e9",
"08e8181e6e639caeaecd84c16d582c0ec3f99474",
"testharness"
],
"mozilla/interfaces.js": [
Expand Down
16 changes: 16 additions & 0 deletions tests/wpt/mozilla/tests/mozilla/interfaces.html
Expand Up @@ -259,6 +259,22 @@
"XMLHttpRequestEventTarget",
"XMLHttpRequestUpload",
"XMLSerializer",
"XR",
"XRFrame",
"XRInputSource",
"XRInputSourceArray",
"XRInputSourceEvent",
"XRPose",
"XRReferenceSpace",
"XRRenderState",
"XRRigidTransform",
"XRSession",
"XRSessionEvent",
"XRSpace",
"XRView",
"XRViewerPose",
"XRViewport",
"XRWebGLLayer",
"console",
]);
</script>
5 changes: 4 additions & 1 deletion tests/wpt/webgl/meta/conformance/context/methods.html.ini
Expand Up @@ -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

0 comments on commit eb363ec

Please sign in to comment.