Merge branch 'web' into webmerge2

Cargo.toml

@@ -1,12 +1,13 @@
 [package]
 name = "winit"
-version = "0.20.0-alpha1"
+version = "0.20.0-alpha2"
 authors = ["The winit contributors", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform window creation library."
+edition = "2018"
 keywords = ["windowing"]
 license = "Apache-2.0"
 readme = "README.md"
-repository = "https://github.com/tomaka/winit"
+repository = "https://github.com/rust-windowing/winit"
 documentation = "https://docs.rs/winit"
 categories = ["gui"]
 
@@ -23,6 +24,7 @@ lazy_static = "1"
 libc = "0.2"
 log = "0.4"
 serde = { version = "1", optional = true, features = ["serde_derive"] }
+derivative = "1.0.2"
 
 [dev-dependencies]
 image = "0.21"
@@ -41,6 +43,11 @@ core-graphics = "0.17.3"
 dispatch = "0.1.4"
 objc = "0.2.3"
 
+[target.'cfg(target_os = "macos")'.dependencies.core-video-sys]
+version = "0.1.3"
+default_features = false
+features = ["display_link"]
+
 [target.'cfg(target_os = "windows")'.dependencies]
 bitflags = "1"