7 files changed, 22 insertions, 9 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 7a245f7c09d..7b84ce75070 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,7 +4,7 @@ version = "0.0.1"
 dependencies = [
  "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
- "rust-webvr 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-webvr-api 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2458,13 +2458,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rust-webvr"
-version = "0.5.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "android_injected_glue 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-webvr-api 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rust-webvr-api"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "android_injected_glue 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2583,7 +2592,6 @@ dependencies = [
  "utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
- "webvr 0.0.1",
  "webvr_traits 0.0.1",
  "xml5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3585,6 +3593,7 @@ dependencies = [
  "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
+ "rust-webvr 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
  "servo_config 0.0.1",
  "webvr_traits 0.0.1",
@@ -3901,7 +3910,8 @@ dependencies = [
 "checksum ref_slice 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "825740057197b7d43025e7faf6477eaabc03434e153233da02d1f44602f71527"
 "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
 "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
-"checksum rust-webvr 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6090d0c49df36e14c9b25a6ae3ab6004f44d558c184141a1797554ff65a49b37"
+"checksum rust-webvr 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4514c041e0b1f7e00038acf19f0421c9cd77a629e0e111f319abbde714742003"
+"checksum rust-webvr-api 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ece2e3ecae072ebf033811082cd58ddb46910af1a7e26b0917fdf455a20aab3"
 "checksum rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3058a43ada2c2d0b92b3ae38007a2d0fa5e9db971be260e0171408a4ff471c95"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 60f723055ff..cc9b8efd38b 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -91,7 +91,6 @@ utf-8 = "0.7"
 uuid = {version = "0.5", features = ["v4"]}
 xml5ever = {version = "0.9"}
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
-webvr = {path = "../webvr"}
 webvr_traits = {path = "../webvr_traits"}
 
 [target.'cfg(not(target_os = "ios"))'.dependencies]
diff --git a/components/webvr/Cargo.toml b/components/webvr/Cargo.toml
index f6a7427a709..f1a87e915ea 100644
--- a/components/webvr/Cargo.toml
+++ b/components/webvr/Cargo.toml
@@ -15,6 +15,7 @@ euclid = "0.15"
 ipc-channel = "0.8"
 log = "0.3"
 msg = {path = "../msg"}
+rust-webvr = {version = "0.8", features = ["openvr"]}
 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 0ad9722b21e..77bc6e32134 100644
--- a/components/webvr/lib.rs
+++ b/components/webvr/lib.rs
@@ -10,6 +10,7 @@ extern crate ipc_channel;
 #[macro_use]
 extern crate log;
 extern crate msg;
+extern crate rust_webvr;
 extern crate script_traits;
 extern crate servo_config;
 extern crate webvr_traits;
diff --git a/components/webvr/webvr_thread.rs b/components/webvr/webvr_thread.rs
index 77f42a6b39e..e8aa06af8be 100644
--- a/components/webvr/webvr_thread.rs
+++ b/components/webvr/webvr_thread.rs
@@ -7,6 +7,7 @@ use euclid::Size2D;
 use ipc_channel::ipc;
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
 use msg::constellation_msg::PipelineId;
+use rust_webvr::VRServiceManager;
 use script_traits::ConstellationMsg;
 use servo_config::prefs::PREFS;
 use std::{thread, time};
@@ -358,7 +359,8 @@ impl webgl::WebVRRenderHandler for WebVRCompositorHandler {
                             texture_size: Some((size.width as u32, size.height as u32))
                         };
                         unsafe {
-                            (*compositor.0).submit_frame(&layer);
+                            (*compositor.0).render_layer(&layer);
+                            (*compositor.0).submit_frame();
                         }
                     }
                 }
diff --git a/components/webvr_traits/Cargo.toml b/components/webvr_traits/Cargo.toml
index f83426f1426..e8c0783c467 100644
--- a/components/webvr_traits/Cargo.toml
+++ b/components/webvr_traits/Cargo.toml
@@ -12,5 +12,5 @@ path = "lib.rs"
 [dependencies]
 ipc-channel = "0.8"
 msg = {path = "../msg"}
-rust-webvr = {version = "0.5", features = ["serde-serialization"]}
+rust-webvr-api = {version = "0.8", features = ["serde-serialization"]}
 serde = "1.0"
diff --git a/components/webvr_traits/lib.rs b/components/webvr_traits/lib.rs
index 5773ce1e644..9fd8c85074b 100644
--- a/components/webvr_traits/lib.rs
+++ b/components/webvr_traits/lib.rs
@@ -7,7 +7,7 @@
 extern crate ipc_channel;
 extern crate msg;
 #[macro_use] extern crate serde;
-pub extern crate rust_webvr as webvr;
+pub extern crate rust_webvr_api as webvr;
 
 mod webvr_traits;