From b816c0ff683a162b337cf7528a87354f8b516216 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 18 Nov 2019 14:50:27 -0500
Subject: [PATCH] Enable webxr by default.

---
 resources/prefs.json                             |  4 ++--
 tests/wpt/metadata/webvr/__dir__.ini             |  2 +-
 tests/wpt/mozilla/meta/MANIFEST.json             |  2 +-
 tests/wpt/mozilla/tests/mozilla/interfaces.html  | 16 ++++++++++++++++
 .../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 9139c55c36e2..d715ffab76f3 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 d202f6efd615..45ce97d1e341 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 409d33b4c583..b1babc8b1195 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 f1d58732adaf..08e8181e6e63 100644
--- a/tests/wpt/mozilla/tests/mozilla/interfaces.html
+++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html
@@ -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>
diff --git a/tests/wpt/webgl/meta/conformance/context/methods.html.ini b/tests/wpt/webgl/meta/conformance/context/methods.html.ini
index 3869ed061014..281cbb288e07 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