Avoid recompiling script every time surfman changes

3 files changed, 7 insertions, 7 deletions

diff --git a/ports/glutin/embedder.rs b/ports/glutin/embedder.rs
index fe8ed1ab5b7..44c925af3e4 100644
--- a/ports/glutin/embedder.rs
+++ b/ports/glutin/embedder.rs
@@ -89,7 +89,7 @@ impl EmbedderMethods for EmbedderCallbacks {
         }
     }
 
-    fn register_webxr(&mut self, xr: &mut webxr_api::MainThreadRegistry) {
+    fn register_webxr(&mut self, xr: &mut webxr::MainThreadRegistry) {
         if pref!(dom.webxr.test) {
             xr.register_mock(webxr::headless::HeadlessMockDiscovery::new());
         } else if !opts::get().headless && pref!(dom.webxr.glwindow) {
diff --git a/ports/libsimpleservo/api/Cargo.toml b/ports/libsimpleservo/api/Cargo.toml
index 083012403bb..ce9c10bac1c 100644
--- a/ports/libsimpleservo/api/Cargo.toml
+++ b/ports/libsimpleservo/api/Cargo.toml
@@ -13,7 +13,7 @@ log = "0.4"
 servo-media = { git = "https://github.com/servo/media" }
 
 webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
-webxr = { git = "https://github.com/servo/webxr" , optional = true}
+webxr = { git = "https://github.com/servo/webxr"}
 
 [target.'cfg(not(target_os = "macos"))'.dependencies]
 libc = "0.2"
@@ -47,5 +47,5 @@ no_static_freetype = ["libservo/no_static_freetype"]
 no-wgl = ["libservo/no-wgl"]
 oculusvr = ["libservo/oculusvr"]
 webdriver = ["libservo/webdriver"]
-uwp = ["libservo/uwp", "webxr", "webxr/openxr-api"]
+uwp = ["libservo/uwp", "webxr/openxr-api"]
 webgl_backtrace = ["libservo/webgl_backtrace"]
diff --git a/ports/libsimpleservo/api/src/lib.rs b/ports/libsimpleservo/api/src/lib.rs
index 9b070d4b8e1..0b415ac669c 100644
--- a/ports/libsimpleservo/api/src/lib.rs
+++ b/ports/libsimpleservo/api/src/lib.rs
@@ -49,7 +49,7 @@ pub struct InitOptions {
     pub coordinates: Coordinates,
     pub density: f32,
     pub vr_init: VRInitOptions,
-    pub xr_discovery: Option<Box<dyn webxr_api::Discovery>>,
+    pub xr_discovery: Option<webxr::Discovery>,
     pub enable_subpixel_text_antialiasing: bool,
     pub gl_context_pointer: Option<*const c_void>,
     pub native_display_pointer: Option<*const c_void>,
@@ -591,7 +591,7 @@ impl ServoGlue {
 
 struct ServoEmbedderCallbacks {
     waker: Box<dyn EventLoopWaker>,
-    xr_discovery: Option<Box<dyn webxr_api::Discovery>>,
+    xr_discovery: Option<webxr::Discovery>,
     vr_init: VRInitOptions,
     #[allow(unused)]
     gl: Rc<dyn gl::Gl>,
@@ -626,7 +626,7 @@ impl EmbedderMethods for ServoEmbedderCallbacks {
     }
 
     #[cfg(feature = "uwp")]
-    fn register_webxr(&mut self, registry: &mut webxr_api::MainThreadRegistry) {
+    fn register_webxr(&mut self, registry: &mut webxr::MainThreadRegistry) {
         debug!("EmbedderMethods::register_xr");
         assert!(
             self.xr_discovery.is_none(),
@@ -638,7 +638,7 @@ impl EmbedderMethods for ServoEmbedderCallbacks {
     }
 
     #[cfg(not(feature = "uwp"))]
-    fn register_webxr(&mut self, registry: &mut webxr_api::MainThreadRegistry) {
+    fn register_webxr(&mut self, registry: &mut webxr::MainThreadRegistry) {
         debug!("EmbedderMethods::register_xr");
         if let Some(discovery) = self.xr_discovery.take() {
             registry.register(discovery);