Avoid recompiling script every time surfman changes

9 files changed, 13 insertions, 7 deletions

diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index d8391bf7858..95136e677fd 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -40,4 +40,5 @@ webrender_traits = {path = "../webrender_traits"}
 webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
 # NOTE: the sm-angle feature only enables angle on windows, not other platforms!
 surfman = { version = "0.1", features = ["sm-angle", "sm-osmesa"] }
-surfman-chains = "0.1"
+surfman-chains = "0.2"
+surfman-chains-api = "0.2"
diff --git a/components/canvas/webgl_mode/inprocess.rs b/components/canvas/webgl_mode/inprocess.rs
index f033a72cf38..46c99fffaa8 100644
--- a/components/canvas/webgl_mode/inprocess.rs
+++ b/components/canvas/webgl_mode/inprocess.rs
@@ -19,6 +19,8 @@ use surfman::platform::generic::universal::device::Device;
 use surfman::platform::generic::universal::surface::SurfaceTexture;
 use surfman::SurfaceInfo;
 use surfman_chains::SwapChains;
+use surfman_chains_api::SwapChainAPI;
+use surfman_chains_api::SwapChainsAPI;
 use webrender_traits::{WebrenderExternalImageApi, WebrenderExternalImageRegistry};
 use webxr_api::SwapChainId as WebXRSwapChainId;
 
diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs
index efb8e1ede49..810d869e87c 100644
--- a/components/canvas/webgl_thread.rs
+++ b/components/canvas/webgl_thread.rs
@@ -70,6 +70,7 @@ use surfman::SurfaceAccess;
 use surfman::SurfaceInfo;
 use surfman::SurfaceType;
 use surfman_chains::SwapChains;
+use surfman_chains_api::SwapChainsAPI;
 use webrender_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
 use webxr_api::SwapChainId as WebXRSwapChainId;
 
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 54ab58343ad..7a1581a70ad 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -41,7 +41,7 @@ webrender = {git = "https://github.com/servo/webrender", features = ["capture"]}
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 webvr_traits = {path = "../webvr_traits"}
 webvr = {path = "../webvr"}
-webxr-api = {git = "https://github.com/servo/webxr"}
+webxr = {git = "https://github.com/servo/webxr"}
 
 [build-dependencies]
 toml = "0.5"
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index abfcf6b1aa1..10f7e6de2e6 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -182,7 +182,7 @@ pub struct IOCompositor<Window: WindowMethods + ?Sized> {
     webvr_heartbeats: Vec<Box<dyn WebVRMainThreadHeartbeat>>,
 
     /// Some XR devices want to run on the main thread.
-    pub webxr_main_thread: webxr_api::MainThreadRegistry,
+    pub webxr_main_thread: webxr::MainThreadRegistry,
 
     /// Map of the pending paint metrics per layout thread.
     /// The layout thread for each specific pipeline expects the compositor to
diff --git a/components/compositing/compositor_thread.rs b/components/compositing/compositor_thread.rs
index f5a14352c96..bdb35fa0db2 100644
--- a/components/compositing/compositor_thread.rs
+++ b/components/compositing/compositor_thread.rs
@@ -164,5 +164,5 @@ pub struct InitialCompositorState {
     pub webrender_document: webrender_api::DocumentId,
     pub webrender_api: webrender_api::RenderApi,
     pub webvr_heartbeats: Vec<Box<dyn WebVRMainThreadHeartbeat>>,
-    pub webxr_main_thread: webxr_api::MainThreadRegistry,
+    pub webxr_main_thread: webxr::MainThreadRegistry,
 }
diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs
index e2438e40518..decece701f4 100644
--- a/components/compositing/windowing.rs
+++ b/components/compositing/windowing.rs
@@ -19,6 +19,7 @@ use std::fmt::{Debug, Error, Formatter};
 use std::rc::Rc;
 use std::time::Duration;
 use style_traits::DevicePixel;
+
 use webrender_api::units::DevicePoint;
 use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize};
 use webrender_api::ScrollLocation;
@@ -176,7 +177,7 @@ pub trait EmbedderMethods {
     }
 
     /// Register services with a WebXR Registry.
-    fn register_webxr(&mut self, _: &mut webxr_api::MainThreadRegistry) {}
+    fn register_webxr(&mut self, _: &mut webxr::MainThreadRegistry) {}
 }
 
 #[derive(Clone, Copy, Debug)]
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 8b56bfbc8d9..f3e4cd086c5 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -82,6 +82,7 @@ webdriver_server = {path = "../webdriver_server", optional = true}
 webvr = {path = "../webvr"}
 webvr_traits = {path = "../webvr_traits"}
 webxr-api = {git = "https://github.com/servo/webxr"}
+webxr = {git = "https://github.com/servo/webxr"}
 surfman = { version = "0.1", features = ["sm-osmesa"] }
 
 [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 9a39856c762..3d4b7bf14d3 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -422,7 +422,7 @@ where
 
         // For the moment, we enable use both the webxr crate and the rust-webvr crate,
         // but we are migrating over to just using webxr.
-        let mut webxr_main_thread = webxr_api::MainThreadRegistry::new(event_loop_waker)
+        let mut webxr_main_thread = webxr::MainThreadRegistry::new(event_loop_waker)
             .expect("Failed to create WebXR device registry");
         if pref!(dom.webxr.enabled) {
             embedder.register_webxr(&mut webxr_main_thread);
@@ -1010,7 +1010,7 @@ fn create_webgl_threads<W>(
     webrender: &mut webrender::Renderer,
     webrender_api_sender: webrender_api::RenderApiSender,
     webvr_compositor: Option<Box<WebVRCompositorHandler>>,
-    webxr_main_thread: &mut webxr_api::MainThreadRegistry,
+    webxr_main_thread: &mut webxr::MainThreadRegistry,
     external_image_handlers: &mut WebrenderExternalImageHandlers,
     external_images: Arc<Mutex<WebrenderExternalImageRegistry>>,
 ) -> WebGLThreads