Update for glutin wasm_stub branch tracking Rust 2018 changes

rust-windowing/glutin@c0b3605
iceiix/glutin#1

Cargo.toml

@@ -21,7 +21,7 @@ opt-level = 1
 cfg-if = "0.1.2"
 wasm-bindgen = "0.2.33"
 sha-1 = "0.8.1"
-glutin = { git = "https://github.com/iceiix/glutin", rev = "97797352b5242436cb82d8ecfb44242b69766e4c" }
+glutin = { git = "https://github.com/iceiix/glutin", rev = "de52fba20678f3931fba3eb6700774469e48512f" }
 byteorder = "1.2.7"
 serde = "1.0.89"
 serde_json = "1.0.39"

src/gl/mod.rs

@@ -22,7 +22,7 @@ use std::ptr;
 use std::ops::{Deref, DerefMut};
 
 /// Inits the gl library. This should be called once a context is ready.
-pub fn init(vid: & glutin::CombinedContext) {
+pub fn init(vid: & glutin::WindowedContext) {
     gl::load_with(|s| vid.get_proc_address(s) as *const _);
 }
 

src/main.rs

@@ -215,7 +215,7 @@ pub fn main() {
         .with_gl(glutin::GlRequest::GlThenGles{opengl_version: (3, 2), opengles_version: (2, 0)})
         .with_gl_profile(glutin::GlProfile::Core)
         .with_vsync(vsync);
-    let mut window = glutin::CombinedContext::new(window_builder, context, &events_loop)
+    let mut window = glutin::WindowedContext::new(window_builder, context, &events_loop)
         .expect("Could not create glutin window.");
 
     unsafe {
@@ -328,7 +328,7 @@ pub fn main() {
     }
 }
 
-fn handle_window_event(window: &mut glutin::CombinedContext,
+fn handle_window_event(window: &mut glutin::WindowedContext,
                        game: &mut Game,
                        ui_container: &mut ui::Container,
                        event: glutin::Event) {