Update glutin and winit

servo · bors-servo · May 27, 2018 · May 24, 2018 · May 24, 2018 · May 25, 2018
commit a0941d5e58feeb697c67169509a1fd1e8c550b10
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/direct-composition/Cargo.toml b/direct-composition/Cargo.toml
@@ -10,4 +10,4 @@ gleam = "0.5"
 mozangle = {version = "0.1", features = ["egl"]}
 webrender = {path = "../webrender"}
 winapi = {version = "0.3", features = ["winerror", "d3d11", "dcomp"]}
-winit = "0.11"
+winit = "0.13"
diff --git a/webrender/Cargo.toml b/webrender/Cargo.toml
@@ -64,7 +64,7 @@ optional = true
 mozangle = "0.1"
 env_logger = "0.5"
 rand = "0.3"                # for the benchmarks
-glutin = "0.13"             # for the example apps
+glutin = "0.15"             # for the example apps
 
 [target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
 freetype = { version = "0.4", default-features = false }

diff --git a/webrender/examples/common/boilerplate.rs b/webrender/examples/common/boilerplate.rs
@@ -196,7 +196,7 @@ pub fn main_wrapper<E: Example>(
         let mut custom_event = true;
 
         match global_event {
-            glutin::Event::WindowEvent { event: glutin::WindowEvent::Closed, .. } => return glutin::ControlFlow::Break,
+            glutin::Event::WindowEvent { event: glutin::WindowEvent::CloseRequested, .. } => return glutin::ControlFlow::Break,
             glutin::Event::WindowEvent {
                 event: glutin::WindowEvent::KeyboardInput {
                     input: glutin::KeyboardInput {

diff --git a/webrender/examples/multiwindow.rs b/webrender/examples/multiwindow.rs
@@ -136,7 +136,7 @@ impl Window {
 
         self.events_loop.poll_events(|global_event| match global_event {
             glutin::Event::WindowEvent { event, .. } => match event {
-                glutin::WindowEvent::Closed |
+                glutin::WindowEvent::CloseRequested |
                 glutin::WindowEvent::KeyboardInput {
                     input: glutin::KeyboardInput {
                         virtual_keycode: Some(glutin::VirtualKeyCode::Escape),

diff --git a/wrench/Cargo.toml b/wrench/Cargo.toml
@@ -12,7 +12,7 @@ byteorder = "1.0"
 env_logger = { version = "0.5", optional = true }
 euclid = "0.17"
 gleam = "0.5"
-glutin = "0.13"
+glutin = "0.15"
 app_units = "0.6"
 image = "0.18"
 clap = { version = "2", features = ["yaml"] }

diff --git a/wrench/src/main.rs b/wrench/src/main.rs
@@ -525,7 +525,7 @@ fn main() {
                 do_render = true;
             }
             glutin::Event::WindowEvent { event, .. } => match event {
-                glutin::WindowEvent::Closed => {
+                glutin::WindowEvent::CloseRequested => {
                     return glutin::ControlFlow::Break;
                 }
                 glutin::WindowEvent::Refresh |