From 6b6b8332f3901d0d9eafb69d0d2768a411805add Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Thu, 1 Sep 2016 19:35:37 -0500 Subject: [PATCH] servo: Merge #13160 - Update WR + core-graphics to get mac AA fix (from glennw:wr-update-aa); r=emilio Source-Repo: https://github.com/servo/servo Source-Revision: 92c3961743daddefc24846aad734ed5bce715978 --- servo/components/servo/Cargo.lock | 22 +++++++++++----------- servo/ports/cef/Cargo.lock | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/servo/components/servo/Cargo.lock b/servo/components/servo/Cargo.lock index 7686aeb2102e..8de62af1de61 100644 --- a/servo/components/servo/Cargo.lock +++ b/servo/components/servo/Cargo.lock @@ -108,7 +108,7 @@ source = "git+https://github.com/servo/rust-azure#9fb666b2fc86b23761f9b0f877a3d4 dependencies = [ "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", @@ -280,7 +280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -406,7 +406,7 @@ dependencies = [ [[package]] name = "core-graphics" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -420,7 +420,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -764,7 +764,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2116,7 +2116,7 @@ dependencies = [ "cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2585,13 +2585,13 @@ dependencies = [ [[package]] name = "webrender" version = "0.5.1" -source = "git+https://github.com/servo/webrender#a235d5bd9d3d5174e5b71542277358a9534e7f44" +source = "git+https://github.com/servo/webrender#7ef9be126aa9217bce7711707448dcd1ebd3a370" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2610,11 +2610,11 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.5.1" -source = "git+https://github.com/servo/webrender#a235d5bd9d3d5174e5b71542277358a9534e7f44" +source = "git+https://github.com/servo/webrender#7ef9be126aa9217bce7711707448dcd1ebd3a370" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2742,7 +2742,7 @@ dependencies = [ "checksum cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e3d6405328b6edb412158b3b7710e2634e23f3614b9bb1c412df7952489a626" "checksum core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "20a6d0448d3a99d977ae4a2aa5a98d886a923e863e81ad9ff814645b6feb3bbd" "checksum core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "05eed248dc504a5391c63794fe4fb64f46f071280afaa1b73308f3c0ce4574c5" -"checksum core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0616eec7bd1caecc203b697348f74cb482953b7188298fb93fb97b74e5a9018c" +"checksum core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c1e70c26fbf342d448e01510360eefeb20a4f26c9e47d687843212f14e5122" "checksum core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2debbf22a8358e5e270e958b6d65694667be7a2ef9c3a2bf05a0872a3124dc98" "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97" "checksum cssparser 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e071724b9769173d83934933953dc57e77800ee18e9c3d2f61d2a10d8fe23547" diff --git a/servo/ports/cef/Cargo.lock b/servo/ports/cef/Cargo.lock index 61a0c37c836a..780b7acfdc84 100644 --- a/servo/ports/cef/Cargo.lock +++ b/servo/ports/cef/Cargo.lock @@ -82,7 +82,7 @@ source = "git+https://github.com/servo/rust-azure#9fb666b2fc86b23761f9b0f877a3d4 dependencies = [ "cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", @@ -254,7 +254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -364,7 +364,7 @@ dependencies = [ [[package]] name = "core-graphics" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -378,7 +378,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -681,7 +681,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1999,7 +1999,7 @@ dependencies = [ "cgl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2445,13 +2445,13 @@ dependencies = [ [[package]] name = "webrender" version = "0.5.1" -source = "git+https://github.com/servo/webrender#a235d5bd9d3d5174e5b71542277358a9534e7f44" +source = "git+https://github.com/servo/webrender#7ef9be126aa9217bce7711707448dcd1ebd3a370" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2470,11 +2470,11 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.5.1" -source = "git+https://github.com/servo/webrender#a235d5bd9d3d5174e5b71542277358a9534e7f44" +source = "git+https://github.com/servo/webrender#7ef9be126aa9217bce7711707448dcd1ebd3a370" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2601,7 +2601,7 @@ dependencies = [ "checksum cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e3d6405328b6edb412158b3b7710e2634e23f3614b9bb1c412df7952489a626" "checksum core-foundation 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "20a6d0448d3a99d977ae4a2aa5a98d886a923e863e81ad9ff814645b6feb3bbd" "checksum core-foundation-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "05eed248dc504a5391c63794fe4fb64f46f071280afaa1b73308f3c0ce4574c5" -"checksum core-graphics 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0616eec7bd1caecc203b697348f74cb482953b7188298fb93fb97b74e5a9018c" +"checksum core-graphics 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c1e70c26fbf342d448e01510360eefeb20a4f26c9e47d687843212f14e5122" "checksum core-text 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2debbf22a8358e5e270e958b6d65694667be7a2ef9c3a2bf05a0872a3124dc98" "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97" "checksum cssparser 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e071724b9769173d83934933953dc57e77800ee18e9c3d2f61d2a10d8fe23547"