Revert glutin upgrade.

components/background_hang_monitor/Cargo.toml

@@ -30,5 +30,5 @@ lazy_static = "1.0"
 mach = "0.2.3"
 
 [target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies]
-nix = "0.13"
+nix = "~0.11.0"
 unwind-sys = "0.1.1"

components/canvas/Cargo.toml

@@ -21,7 +21,7 @@ compositing = {path = "../compositing"}
 cssparser = "0.25"
 euclid = "0.19"
 fnv = "1.0"
-gleam = "0.6.7"
+gleam = "0.6.4"
 half = "1"
 ipc-channel = "0.11"
 log = "0.4"

components/layout/Cargo.toml

@@ -33,7 +33,7 @@ msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 num-traits = "0.2"
 ordered-float = "1.0"
-parking_lot = "0.7"
+parking_lot = "0.6"
 profile_traits = {path = "../profile_traits"}
 range = {path = "../range"}
 rayon = "1"

components/layout_thread/Cargo.toml

@@ -36,7 +36,7 @@ malloc_size_of = { path = "../malloc_size_of" }
 metrics = {path = "../metrics"}
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
-parking_lot = "0.7"
+parking_lot = "0.6"
 profile_traits = {path = "../profile_traits"}
 range = {path = "../range"}
 rayon = "1"

components/script/Cargo.toml

@@ -79,7 +79,7 @@ mime_guess = "2.0.0-alpha.6"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 num-traits = "0.2"
-parking_lot = "0.7"
+parking_lot = "0.6"
 phf = "0.7.18"
 pixels = {path = "../pixels"}
 profile_traits = {path = "../profile_traits"}

components/style/Cargo.toml

@@ -53,7 +53,7 @@ num-traits = "0.2"
 num-derive = "0.2"
 ordered-float = "1.0"
 owning_ref = "0.4"
-parking_lot = "0.7"
+parking_lot = "0.6"
 precomputed-hash = "0.1.1"
 rayon = "1"
 selectors = { path = "../selectors" }

components/webvr/Cargo.toml

@@ -22,7 +22,7 @@ gleam = "0.6"
 ipc-channel = "0.11"
 log = "0.4"
 msg = {path = "../msg"}
-rust-webvr = {version = "0.11", features = ["openvr", "vrexternal"]}
+rust-webvr = {version = "=0.11.0", features = ["openvr", "vrexternal"]}
 script_traits = {path = "../script_traits"}
 servo_config = {path = "../config"}
 webvr_traits = {path = "../webvr_traits" }

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", features = ["ipc"]}
+rust-webvr-api = {version = "=0.11.0", features = ["ipc"]}
 serde = "1.0"

ports/glutin/Cargo.toml

@@ -46,13 +46,13 @@ bitflags = "1.0"
 crossbeam-channel = "0.3"
 euclid = "0.19"
 gleam = "0.6"
-glutin = "0.21.0"
+glutin = "0.19"
 keyboard-types = "0.4.3"
 lazy_static = "1"
 libservo = {path = "../../components/servo"}
 libc = "0.2"
 log = "0.4"
-rust-webvr = { version = "0.11", features = ["glwindow"] }
+rust-webvr = { version = "=0.11.0", features = ["glwindow"] }
 tinyfiledialogs = "3.0"
 
 [target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies]

ports/glutin/embedder.rs

@@ -9,6 +9,7 @@ use crate::events_loop::EventsLoop;
 use gleam::gl;
 use glutin;
 use glutin::dpi::LogicalSize;
+use glutin::{ContextBuilder, GlWindow};
 use rust_webvr::GlWindowVRService;
 use servo::compositing::windowing::EmbedderMethods;
 use servo::embedder_traits::EventLoopWaker;
@@ -51,13 +52,14 @@ impl EmbedderMethods for EmbedderCallbacks {
                     .with_dimensions(size)
                     .with_visibility(false)
                     .with_multitouch();
-                let context = glutin::ContextBuilder::new()
+                let context_builder = ContextBuilder::new()
                     .with_gl(app::gl_version())
-                    .with_vsync(false) // Assume the browser vsync is the same as the test VR window vsync
-                    .build_windowed(window_builder, &*self.events_loop.borrow().as_winit())
-                    .expect("Failed to create window.");
+                    .with_vsync(false); // Assume the browser vsync is the same as the test VR window vsync
+                let gl_window =
+                    GlWindow::new(window_builder, context_builder, &*self.events_loop.borrow().as_winit())
+                        .expect("Failed to create window.");
                 let gl = self.gl.clone();
-                let (service, heartbeat) = GlWindowVRService::new(name, context, gl);
+                let (service, heartbeat) = GlWindowVRService::new(name, gl_window, gl);
 
                 services.register(Box::new(service));
                 heartbeats.push(Box::new(heartbeat));