Use surfman for managing GL surfaces

Co-authored-by: Alan Jeffrey <ajeffrey@mozilla.com>
Co-authored-by: Zakor Gyula <gyula.zakor@h-lab.eu>
Co-authored-by: Josh Matthews <josh@joshmatthews.net>

components/background_hang_monitor/Cargo.toml

@@ -25,7 +25,7 @@ crossbeam-channel = "0.3"
 lazy_static = "1.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-mach = "0.2.3"
+mach = "0.3"
 
 [target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies]
 nix = "0.14"

components/canvas/Cargo.toml

@@ -14,10 +14,11 @@ path = "lib.rs"
 canvas2d-azure = ["azure"]
 canvas2d-raqote = ["raqote"]
 webgl_backtrace = ["canvas_traits/webgl_backtrace"]
-no_wgl = ["offscreen_gl_context/no_wgl"]
+no-wgl = ["surfman/sm-no-wgl"]
 
 [dependencies]
 azure = {git = "https://github.com/servo/rust-azure", optional = true}
+bitflags = "1.0"
 byteorder = "1"
 canvas_traits = {path = "../canvas_traits"}
 cssparser = "0.27.1"
@@ -29,12 +30,14 @@ half = "1"
 ipc-channel = "0.12"
 log = "0.4"
 num-traits = "0.2"
-offscreen_gl_context = {version = "0.25", features = ["serde", "osmesa"]}
 raqote = {git = "https://github.com/jrmuizel/raqote", optional = true}
 pixels = {path = "../pixels"}
 servo_config = {path = "../config"}
-sparkle = "0.1"
+sparkle = "0.1.8"
 webrender = {git = "https://github.com/servo/webrender"}
 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" }