Auto merge of #18598 - glennw:update-wr-driver-bug, r=emilio

Update WR (work around a mac GL driver bug).

Also includes updates to the mac core-* crates and friends.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18598)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-24 16:13:47 -05:00 committed by GitHub
commit 61f0fc199e
8 changed files with 104 additions and 110 deletions

View file

@ -37,7 +37,7 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
[target.'cfg(target_os="macos")'.dependencies]
objc = "0.2"
cocoa = "0.9"
cocoa = "0.10"
[target.'cfg(target_os="linux")'.dependencies]
x11 = "2.3"

View file

@ -18,7 +18,7 @@ log = "0.3.5"
msg = {path = "../../components/msg"}
net_traits = {path = "../../components/net_traits"}
script_traits = {path = "../../components/script_traits"}
servo-glutin = "0.11"
servo-glutin = "0.12"
servo_geometry = {path = "../../components/geometry"}
servo_config = {path = "../../components/config"}
servo_url = {path = "../../components/url"}