Update surfman to use Git version

components/canvas/Cargo.toml

@@ -39,5 +39,5 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 webrender_traits = {path = "../webrender_traits"}
 webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
 # NOTE: the sm-angle feature only enables angle on windows, not other platforms!
-surfman = { git = "https://github.com/pcwalton/surfman", features = ["sm-angle", "sm-osmesa"] }
-surfman-chains =  { git = "https://github.com/asajeffrey/surfman-chains" }
+surfman = { version = "0.1", features = ["sm-angle", "sm-osmesa"] }
+surfman-chains = "0.1"

components/canvas/webgl_thread.rs

@@ -588,6 +588,10 @@ impl WebGLThread {
             swap_chain
                 .resize(&mut self.device, &mut data.ctx, size.to_i32())
                 .expect("Failed to resize swap chain");
+            // temporary, till https://github.com/pcwalton/surfman/issues/35 is fixed
+            self.device
+                .make_context_current(&data.ctx)
+                .expect("Failed to make context current again");
             swap_chain
                 .clear_surface(&mut self.device, &mut data.ctx, &*data.gl)
                 .expect("Failed to clear resized swap chain");

components/servo/Cargo.toml

@@ -82,7 +82,7 @@ webdriver_server = {path = "../webdriver_server", optional = true}
 webvr = {path = "../webvr"}
 webvr_traits = {path = "../webvr_traits"}
 webxr-api = {git = "https://github.com/servo/webxr"}
-surfman = { git = "https://github.com/pcwalton/surfman", features = ["sm-osmesa"] }
+surfman = { version = "0.1", features = ["sm-osmesa"] }
 
 [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
 gaol = "0.2.1"