diff options
| author | Alan Jeffrey <ajeffrey@mozilla.com> | 2019-04-25 12:54:09 -0500 |
|---|---|---|
| committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2019-06-13 15:04:05 -0500 |
| commit | 0b48ff496fc42dfff1ed7a3a3b15b78470a49c39 (patch) | |
| tree | 2378af0aa6ce365ef1b353b7ed2b750e5b418374 /components | |
| parent | e381cebeb6cb9dbf7ca5555bcd40f427470e353a (diff) | |
| download | servo-0b48ff496fc42dfff1ed7a3a3b15b78470a49c39.tar.gz servo-0b48ff496fc42dfff1ed7a3a3b15b78470a49c39.zip | |
Add Servo3D immersive demo for magicleap
Diffstat (limited to 'components')
| -rw-r--r-- | components/compositing/windowing.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/window.rs | 2 | ||||
| -rw-r--r-- | components/servo/lib.rs | 2 | ||||
| -rw-r--r-- | components/webvr/Cargo.toml | 3 | ||||
| -rw-r--r-- | components/webvr/lib.rs | 1 | ||||
| -rw-r--r-- | components/webvr_traits/Cargo.toml | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs index d4cc1abb4a5..21592419875 100644 --- a/components/compositing/windowing.rs +++ b/components/compositing/windowing.rs @@ -161,10 +161,10 @@ pub trait WindowMethods { pub trait EmbedderMethods { /// Returns a thread-safe object to wake up the window's event loop. - fn create_event_loop_waker(&self) -> Box<dyn EventLoopWaker>; + fn create_event_loop_waker(&mut self) -> Box<dyn EventLoopWaker>; /// Register services with a VRServiceManager. fn register_vr_services( - &self, + &mut self, _: &mut VRServiceManager, _: &mut Vec<Box<WebVRMainThreadHeartbeat>>, ) { diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 881c126da1f..bb0e8198beb 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -1436,7 +1436,7 @@ impl Window { let complete = match join_port.try_recv() { Err(TryRecvError::Empty) => { - info!("script: waiting on layout"); + debug!("script: waiting on layout"); join_port.recv().unwrap() }, Ok(reflow_complete) => reflow_complete, diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 61ddd3f1e0f..011b4a77b64 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -199,7 +199,7 @@ impl<Window> Servo<Window> where Window: WindowMethods + 'static + ?Sized, { - pub fn new(embedder: Box<EmbedderMethods>, window: Rc<Window>) -> Servo<Window> { + pub fn new(mut embedder: Box<EmbedderMethods>, window: Rc<Window>) -> Servo<Window> { // Global configuration options, parsed from the command line. let opts = opts::get(); diff --git a/components/webvr/Cargo.toml b/components/webvr/Cargo.toml index b7f3c76c49e..7d751173906 100644 --- a/components/webvr/Cargo.toml +++ b/components/webvr/Cargo.toml @@ -22,7 +22,8 @@ gleam = "0.6" ipc-channel = "0.11.2" log = "0.4" msg = {path = "../msg"} -rust-webvr = {version = "0.11.3", features = ["mock", "openvr", "vrexternal"]} +rust-webvr = {version = "0.11.4", features = ["mock", "openvr", "vrexternal"]} +rust-webvr-api = "0.11.4" script_traits = {path = "../script_traits"} servo_config = {path = "../config"} webvr_traits = {path = "../webvr_traits" } diff --git a/components/webvr/lib.rs b/components/webvr/lib.rs index cc24381ca57..e281f4937eb 100644 --- a/components/webvr/lib.rs +++ b/components/webvr/lib.rs @@ -12,3 +12,4 @@ pub use crate::webvr_thread::{WebVRCompositorHandler, WebVRThread}; pub use rust_webvr::api::VRExternalShmemPtr; pub use rust_webvr::VRMainThreadHeartbeat; pub use rust_webvr::VRServiceManager; +pub use rust_webvr_api::VRService; diff --git a/components/webvr_traits/Cargo.toml b/components/webvr_traits/Cargo.toml index 72a7e632fd3..b1d986343ed 100644 --- a/components/webvr_traits/Cargo.toml +++ b/components/webvr_traits/Cargo.toml @@ -13,5 +13,5 @@ path = "lib.rs" [dependencies] ipc-channel = "0.11" msg = {path = "../msg"} -rust-webvr-api = {version = "0.11.1", features = ["ipc"]} +rust-webvr-api = {version = "0.11.4", features = ["ipc"]} serde = "1.0" |