servo: Merge #5170 - Fix scrolling on OS X (from metajack:update-cocoa-glutin); r=pcwalton

This just requires updating glutin and cocoa to pick up some backported fixes.

Source-Repo: https://github.com/servo/servo
Source-Revision: da880af7428e3b76a9a5e7d3a5ff2c80a32d63f0

servo/components/servo/Cargo.lock

@@ -76,7 +76,7 @@ dependencies = [
 [[package]]
 name = "cocoa"
 version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#458971cb1199cd25fd31f9c17852e76926622b92"
+source = "git+https://github.com/servo/rust-cocoa?branch=backport-20150306#c9b0a66dedd93d696e7281c9a3d743e54b502b96"
 dependencies = [
  "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -358,10 +358,10 @@ dependencies = [
 [[package]]
 name = "glutin"
 version = "0.0.4"
-source = "git+https://github.com/servo/glutin?branch=servo#40591806dc7382ddb75d90f2289127f5f28f9825"
+source = "git+https://github.com/servo/glutin?branch=backport-20150306#89fbec47145eef519e2f3d7e0ad84e5f905f7295"
 dependencies = [
  "android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)",
- "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
+ "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa?branch=backport-20150306)",
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
  "gdi32-sys 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -384,7 +384,7 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "gleam 0.0.1 (git+https://github.com/servo/gleam)",
- "glutin 0.0.4 (git+https://github.com/servo/glutin?branch=servo)",
+ "glutin 0.0.4 (git+https://github.com/servo/glutin?branch=backport-20150306)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",

servo/ports/cef/Cargo.lock

@@ -4,7 +4,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
- "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
+ "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa?branch=backport-20150306)",
  "compositing 0.0.1",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
  "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
@@ -79,7 +79,7 @@ dependencies = [
 [[package]]
 name = "cocoa"
 version = "0.1.1"
-source = "git+https://github.com/servo/rust-cocoa#458971cb1199cd25fd31f9c17852e76926622b92"
+source = "git+https://github.com/servo/rust-cocoa?branch=backport-20150306#c9b0a66dedd93d696e7281c9a3d743e54b502b96"
 dependencies = [
  "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -361,10 +361,10 @@ dependencies = [
 [[package]]
 name = "glutin"
 version = "0.0.4"
-source = "git+https://github.com/servo/glutin?branch=servo#40591806dc7382ddb75d90f2289127f5f28f9825"
+source = "git+https://github.com/servo/glutin?branch=backport-20150306#89fbec47145eef519e2f3d7e0ad84e5f905f7295"
 dependencies = [
  "android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)",
- "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
+ "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa?branch=backport-20150306)",
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
  "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
  "gdi32-sys 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -387,7 +387,7 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "gleam 0.0.1 (git+https://github.com/servo/gleam)",
- "glutin 0.0.4 (git+https://github.com/servo/glutin?branch=servo)",
+ "glutin 0.0.4 (git+https://github.com/servo/glutin?branch=backport-20150306)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",

servo/ports/cef/Cargo.toml

@@ -67,6 +67,7 @@ git = "https://github.com/servo/rust-core-text"
 
 [dependencies.cocoa]
 git = "https://github.com/servo/rust-cocoa"
+branch = "backport-20150306"
 
 [dependencies.gleam]
 git = "https://github.com/servo/gleam"
@@ -76,4 +77,4 @@ git = "https://github.com/servo/rust-cgl"
 
 [dependencies]
 url = "*"
-libc = "*"
+libc = "*"

servo/ports/glutin/Cargo.toml

@@ -28,7 +28,7 @@ path = "../../components/util"
 
 [dependencies.glutin]
 git = "https://github.com/servo/glutin"
-branch = "servo"
+branch = "backport-20150306"
 
 [dependencies.gleam]
 git = "https://github.com/servo/gleam"
@@ -43,4 +43,4 @@ git = "https://github.com/servo/rust-egl"
 time = "0.1.12"
 bitflags = "*"
 libc = "*"
-url = "*"
+url = "*"