From a099f50bcc2260218543c291df16bbd154dd446d Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Mon, 16 Oct 2017 12:54:02 -0500 Subject: [PATCH] servo: Merge #18890 - Update WR (details below): (from glennw:update-wr-clip-text-aa); r=jdm * Add support for clip masks on text runs. * Fix atomic ordering of items with multiple shadows. * Update to bincode + ipc-channel with optimizations. * Fix some plane splitting precision errors. * Improve the anti-aliasing quality significantly. * Add internal ClipChain support. * Fix diacritic glyphs on Linux. Source-Repo: https://github.com/servo/servo Source-Revision: d3d2b0261a8aacd4f74e330f8c007a91f829a96e --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 7e4b2cb3c1826baf96fbd87667ed36f872c8e282 --- servo/Cargo.lock | 77 +++++++++---------- servo/components/bluetooth/Cargo.toml | 2 +- servo/components/bluetooth_traits/Cargo.toml | 2 +- servo/components/canvas/Cargo.toml | 2 +- servo/components/canvas_traits/Cargo.toml | 2 +- servo/components/compositing/Cargo.toml | 2 +- servo/components/constellation/Cargo.toml | 2 +- servo/components/devtools/Cargo.toml | 2 +- servo/components/devtools_traits/Cargo.toml | 2 +- servo/components/gfx/Cargo.toml | 2 +- servo/components/gfx/display_list/mod.rs | 8 +- servo/components/layout/Cargo.toml | 2 +- .../components/layout/display_list_builder.rs | 8 +- servo/components/layout/webrender_helpers.rs | 4 +- servo/components/layout_thread/Cargo.toml | 2 +- servo/components/layout_traits/Cargo.toml | 2 +- servo/components/metrics/Cargo.toml | 2 +- servo/components/net/Cargo.toml | 2 +- servo/components/net_traits/Cargo.toml | 2 +- servo/components/profile/Cargo.toml | 2 +- servo/components/profile_traits/Cargo.toml | 2 +- servo/components/script/Cargo.toml | 2 +- .../script_layout_interface/Cargo.toml | 2 +- servo/components/script_traits/Cargo.toml | 2 +- servo/components/servo/Cargo.toml | 2 +- servo/components/webdriver_server/Cargo.toml | 2 +- servo/components/webvr/Cargo.toml | 2 +- servo/components/webvr_traits/Cargo.toml | 2 +- servo/tests/unit/gfx/Cargo.toml | 2 +- servo/tests/unit/metrics/Cargo.toml | 2 +- servo/tests/unit/net/Cargo.toml | 2 +- servo/tests/unit/profile/Cargo.toml | 2 +- 32 files changed, 76 insertions(+), 77 deletions(-) diff --git a/servo/Cargo.lock b/servo/Cargo.lock index 19ac18f08fdb..1a6bbc9afe84 100644 --- a/servo/Cargo.lock +++ b/servo/Cargo.lock @@ -2,7 +2,7 @@ name = "webvr_traits" version = "0.0.1" dependencies = [ - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rust-webvr-api 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -149,11 +149,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bincode" -version = "0.8.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -209,7 +208,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "bluetooth_traits 0.0.1", "device 0.0.1 (git+https://github.com/servo/devices)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "servo_rand 0.0.1", "tinyfiledialogs 2.5.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -220,7 +219,7 @@ dependencies = [ name = "bluetooth_traits" version = "0.0.1" dependencies = [ - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", @@ -308,7 +307,7 @@ dependencies = [ "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -324,7 +323,7 @@ dependencies = [ "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "nonzero 0.0.1", "offscreen_gl_context 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -469,7 +468,7 @@ dependencies = [ "gfx_traits 0.0.1", "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -502,7 +501,7 @@ dependencies = [ "gfx 0.0.1", "gfx_traits 0.0.1", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "layout_traits 0.0.1", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -695,7 +694,7 @@ dependencies = [ "devtools_traits 0.0.1", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -712,7 +711,7 @@ dependencies = [ "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_url 0.0.1", @@ -1095,7 +1094,7 @@ dependencies = [ "harfbuzz-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1128,7 +1127,7 @@ version = "0.0.1" dependencies = [ "cssparser 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", ] @@ -1419,10 +1418,10 @@ dependencies = [ [[package]] name = "ipc-channel" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bincode 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1510,7 +1509,7 @@ dependencies = [ "gfx_traits 0.0.1", "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1558,7 +1557,7 @@ dependencies = [ "gfx_traits 0.0.1", "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_traits 0.0.1", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1591,7 +1590,7 @@ name = "layout_traits" version = "0.0.1" dependencies = [ "gfx 0.0.1", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "metrics 0.0.1", "msg 0.0.1", "net_traits 0.0.1", @@ -1665,7 +1664,7 @@ dependencies = [ "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "layout_thread 0.0.1", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1795,7 +1794,7 @@ version = "0.0.1" dependencies = [ "gfx 0.0.1", "gfx_traits 0.0.1", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "profile_traits 0.0.1", @@ -1810,7 +1809,7 @@ dependencies = [ "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", "gfx_traits 0.0.1", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "metrics 0.0.1", "msg 0.0.1", "net_traits 0.0.1", @@ -1947,7 +1946,7 @@ dependencies = [ "hyper-openssl 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "immeta 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1994,7 +1993,7 @@ dependencies = [ "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-openssl 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", @@ -2016,7 +2015,7 @@ dependencies = [ "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -2368,7 +2367,7 @@ version = "0.0.1" dependencies = [ "heartbeats-simple 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "influent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", @@ -2384,7 +2383,7 @@ dependencies = [ name = "profile_tests" version = "0.0.1" dependencies = [ - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "profile 0.0.1", "profile_traits 0.0.1", ] @@ -2395,7 +2394,7 @@ version = "0.0.1" dependencies = [ "energy-monitor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "energymon 0.3.0 (git+https://github.com/energymon/energymon-rust.git)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", @@ -2606,7 +2605,7 @@ dependencies = [ "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.6 (git+https://github.com/servo/rust-mozjs)", "jstraceable_derive 0.0.1", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2669,7 +2668,7 @@ dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "metrics 0.0.1", @@ -2716,7 +2715,7 @@ dependencies = [ "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -3583,7 +3582,7 @@ dependencies = [ "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -3600,10 +3599,10 @@ dependencies = [ [[package]] name = "webrender" version = "0.52.1" -source = "git+https://github.com/servo/webrender#cd4415aa563903f08ecd0602ec97a79879efcaf6" +source = "git+https://github.com/servo/webrender#eb3ae93bdca0ad4a6281983af53101c578c964cf" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "bincode 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3628,10 +3627,10 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.52.1" -source = "git+https://github.com/servo/webrender#cd4415aa563903f08ecd0602ec97a79879efcaf6" +source = "git+https://github.com/servo/webrender#eb3ae93bdca0ad4a6281983af53101c578c964cf" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "bincode 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3639,7 +3638,7 @@ dependencies = [ "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3650,7 +3649,7 @@ version = "0.0.1" dependencies = [ "canvas_traits 0.0.1", "euclid 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rust-webvr 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3778,7 +3777,7 @@ dependencies = [ "checksum backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff" "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9" "checksum binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88ceb0d16c4fd0e42876e298d7d3ce3780dd9ebdcbe4199816a32c77e08597ff" -"checksum bincode 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e4a2d3bab374f96192eade8f41914373d7b5fcf030ca2f45141f1e939057259" +"checksum bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a6301db0b49fb63551bc15b5ae348147101cdf323242b93ec7546d5002ff1af" "checksum bindgen 0.29.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ba610cba0c1727ed837316540068b51349b8268c073906067b7c3948598929bd" "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" @@ -3885,7 +3884,7 @@ dependencies = [ "checksum influent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a22b311b83431be3ab9af96ca9ea41554bb4a8551ea871ae44c3ce0c57e55f2c" "checksum io-surface 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4578cee6ed49a17766fa608a4425008313c55ebb7a267622cbddd6b01751e2" "checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be" -"checksum ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a38ad662f104525ac57012e0b79aad07507e3fc11e3bae668bf416264e760ebb" +"checksum ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c10ed089b1921b01ef342c736a37ee0788eeb9a5f373bb2df1ba88d01125064f" "checksum itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4833d6978da405305126af4ac88569b5d71ff758581ce5a987dbfa3755f694fc" "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" "checksum jpeg-decoder 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2805ccb10ffe4d10e06ef68a158ff94c255211ecbae848fbde2146b098f93ce7" diff --git a/servo/components/bluetooth/Cargo.toml b/servo/components/bluetooth/Cargo.toml index 45a1d381d9ad..5683c7b8150c 100644 --- a/servo/components/bluetooth/Cargo.toml +++ b/servo/components/bluetooth/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" bitflags = "0.7" bluetooth_traits = {path = "../bluetooth_traits"} device = {git = "https://github.com/servo/devices", features = ["bluetooth-test"]} -ipc-channel = "0.8" +ipc-channel = "0.9" servo_config = {path = "../config"} servo_rand = {path = "../rand"} uuid = {version = "0.5", features = ["v4"]} diff --git a/servo/components/bluetooth_traits/Cargo.toml b/servo/components/bluetooth_traits/Cargo.toml index d67faf596fa9..cb4009644cc3 100644 --- a/servo/components/bluetooth_traits/Cargo.toml +++ b/servo/components/bluetooth_traits/Cargo.toml @@ -10,7 +10,7 @@ name = "bluetooth_traits" path = "lib.rs" [dependencies] -ipc-channel = "0.8" +ipc-channel = "0.9" regex = "0.2" serde = "1.0" servo_config = {path = "../config"} diff --git a/servo/components/canvas/Cargo.toml b/servo/components/canvas/Cargo.toml index 00eb302369a3..17b69b631e0f 100644 --- a/servo/components/canvas/Cargo.toml +++ b/servo/components/canvas/Cargo.toml @@ -17,7 +17,7 @@ cssparser = "0.22.0" euclid = "0.15" fnv = "1.0" gleam = "0.4" -ipc-channel = "0.8" +ipc-channel = "0.9" log = "0.3.5" num-traits = "0.1.32" offscreen_gl_context = { version = "0.11", features = ["serde", "osmesa"] } diff --git a/servo/components/canvas_traits/Cargo.toml b/servo/components/canvas_traits/Cargo.toml index 8c5143125112..54db398a6815 100644 --- a/servo/components/canvas_traits/Cargo.toml +++ b/servo/components/canvas_traits/Cargo.toml @@ -14,7 +14,7 @@ cssparser = "0.22.0" euclid = "0.15" heapsize = "0.4" heapsize_derive = "0.1" -ipc-channel = "0.8" +ipc-channel = "0.9" lazy_static = "0.2" nonzero = {path = "../nonzero"} offscreen_gl_context = { version = "0.11", features = ["serde"] } diff --git a/servo/components/compositing/Cargo.toml b/servo/components/compositing/Cargo.toml index e8ed7c5d4974..40ec91054486 100644 --- a/servo/components/compositing/Cargo.toml +++ b/servo/components/compositing/Cargo.toml @@ -14,7 +14,7 @@ euclid = "0.15" gfx_traits = {path = "../gfx_traits"} gleam = "0.4" image = "0.16" -ipc-channel = "0.8" +ipc-channel = "0.9" log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} diff --git a/servo/components/constellation/Cargo.toml b/servo/components/constellation/Cargo.toml index 2d659bd4342b..0e48b302dc55 100644 --- a/servo/components/constellation/Cargo.toml +++ b/servo/components/constellation/Cargo.toml @@ -22,7 +22,7 @@ euclid = "0.15" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} hyper = "0.10" -ipc-channel = "0.8" +ipc-channel = "0.9" itertools = "0.5" layout_traits = {path = "../layout_traits"} log = "0.3.5" diff --git a/servo/components/devtools/Cargo.toml b/servo/components/devtools/Cargo.toml index 2ce43e5eb1f6..f5d149f4099b 100644 --- a/servo/components/devtools/Cargo.toml +++ b/servo/components/devtools/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" devtools_traits = {path = "../devtools_traits"} hyper = "0.10" hyper_serde = "0.7" -ipc-channel = "0.8" +ipc-channel = "0.9" log = "0.3.5" msg = {path = "../msg"} serde = "1.0" diff --git a/servo/components/devtools_traits/Cargo.toml b/servo/components/devtools_traits/Cargo.toml index fe0cc20c674b..323cd25f946d 100644 --- a/servo/components/devtools_traits/Cargo.toml +++ b/servo/components/devtools_traits/Cargo.toml @@ -15,7 +15,7 @@ heapsize = "0.4" heapsize_derive = "0.1" hyper = "0.10" hyper_serde = "0.7" -ipc-channel = "0.8" +ipc-channel = "0.9" msg = {path = "../msg"} serde = "1.0" servo_url = {path = "../url"} diff --git a/servo/components/gfx/Cargo.toml b/servo/components/gfx/Cargo.toml index c8ee2d496296..405d9db5646a 100644 --- a/servo/components/gfx/Cargo.toml +++ b/servo/components/gfx/Cargo.toml @@ -23,7 +23,7 @@ gfx_traits = {path = "../gfx_traits"} harfbuzz-sys = "0.1" heapsize = "0.4" heapsize_derive = "0.1" -ipc-channel = "0.8" +ipc-channel = "0.9" lazy_static = "0.2" libc = "0.2" log = "0.3.5" diff --git a/servo/components/gfx/display_list/mod.rs b/servo/components/gfx/display_list/mod.rs index e0284b738057..341024b63eed 100644 --- a/servo/components/gfx/display_list/mod.rs +++ b/servo/components/gfx/display_list/mod.rs @@ -606,7 +606,7 @@ pub enum DisplayItem { Line(Box), BoxShadow(Box), PushTextShadow(Box), - PopTextShadow(Box), + PopAllTextShadows(Box), Iframe(Box), PushStackingContext(Box), PopStackingContext(Box), @@ -1190,7 +1190,7 @@ pub struct PushTextShadowDisplayItem { /// Defines a text shadow that affects all items until the next PopTextShadow. #[derive(Clone, Deserialize, HeapSizeOf, Serialize)] -pub struct PopTextShadowDisplayItem { +pub struct PopAllTextShadowsDisplayItem { /// Fields common to all display items. pub base: BaseDisplayItem, } @@ -1248,7 +1248,7 @@ impl DisplayItem { DisplayItem::Line(ref line) => &line.base, DisplayItem::BoxShadow(ref box_shadow) => &box_shadow.base, DisplayItem::PushTextShadow(ref push_text_shadow) => &push_text_shadow.base, - DisplayItem::PopTextShadow(ref pop_text_shadow) => &pop_text_shadow.base, + DisplayItem::PopAllTextShadows(ref pop_text_shadow) => &pop_text_shadow.base, DisplayItem::Iframe(ref iframe) => &iframe.base, DisplayItem::PushStackingContext(ref stacking_context) => &stacking_context.base, DisplayItem::PopStackingContext(ref item) => &item.base, @@ -1373,7 +1373,7 @@ impl fmt::Debug for DisplayItem { DisplayItem::Line(_) => "Line".to_owned(), DisplayItem::BoxShadow(_) => "BoxShadow".to_owned(), DisplayItem::PushTextShadow(_) => "PushTextShadow".to_owned(), - DisplayItem::PopTextShadow(_) => "PopTextShadow".to_owned(), + DisplayItem::PopAllTextShadows(_) => "PopTextShadow".to_owned(), DisplayItem::Iframe(_) => "Iframe".to_owned(), DisplayItem::PushStackingContext(_) | DisplayItem::PopStackingContext(_) | diff --git a/servo/components/layout/Cargo.toml b/servo/components/layout/Cargo.toml index 273a1446a75f..2becf6a56756 100644 --- a/servo/components/layout/Cargo.toml +++ b/servo/components/layout/Cargo.toml @@ -20,7 +20,7 @@ gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} heapsize = "0.4" html5ever = "0.20.0" -ipc-channel = "0.8" +ipc-channel = "0.9" libc = "0.2" log = "0.3.5" msg = {path = "../msg"} diff --git a/servo/components/layout/display_list_builder.rs b/servo/components/layout/display_list_builder.rs index 522766b5f6d0..f29a1f377aef 100644 --- a/servo/components/layout/display_list_builder.rs +++ b/servo/components/layout/display_list_builder.rs @@ -28,7 +28,7 @@ use gfx::display_list::{BorderRadii, BoxShadowClipMode, BoxShadowDisplayItem, Cl use gfx::display_list::{ClipScrollNodeType, ClippingRegion, DisplayItem, DisplayItemMetadata}; use gfx::display_list::{DisplayList, DisplayListSection, GradientDisplayItem, IframeDisplayItem}; use gfx::display_list::{ImageBorder, ImageDisplayItem, LineDisplayItem, NormalBorder, OpaqueNode}; -use gfx::display_list::{PopTextShadowDisplayItem, PushTextShadowDisplayItem}; +use gfx::display_list::{PopAllTextShadowsDisplayItem, PushTextShadowDisplayItem}; use gfx::display_list::{RadialGradientDisplayItem, SolidColorDisplayItem, StackingContext}; use gfx::display_list::{StackingContextType, TextDisplayItem, TextOrientation, WebRenderImageInfo}; use gfx_traits::{combine_id_with_fragment_type, FragmentType, StackingContextId}; @@ -2340,9 +2340,9 @@ impl FragmentDisplayListBuilding for Fragment { ); } - // Pair all the PushTextShadows - for _ in text_shadows { - state.add_display_item(DisplayItem::PopTextShadow(Box::new(PopTextShadowDisplayItem { + // Pop all the PushTextShadows + if !text_shadows.is_empty() { + state.add_display_item(DisplayItem::PopAllTextShadows(Box::new(PopAllTextShadowsDisplayItem { base: base.clone(), }))); } diff --git a/servo/components/layout/webrender_helpers.rs b/servo/components/layout/webrender_helpers.rs index 8f86477e9806..fbd5d423ddf4 100644 --- a/servo/components/layout/webrender_helpers.rs +++ b/servo/components/layout/webrender_helpers.rs @@ -465,8 +465,8 @@ impl WebRenderDisplayItemConverter for DisplayItem { color: item.color, }); } - DisplayItem::PopTextShadow(_) => { - builder.pop_shadow(); + DisplayItem::PopAllTextShadows(_) => { + builder.pop_all_shadows(); } DisplayItem::Iframe(ref item) => { let rect = item.base.bounds; diff --git a/servo/components/layout_thread/Cargo.toml b/servo/components/layout_thread/Cargo.toml index 5bb340f893a2..4106e86e47ce 100644 --- a/servo/components/layout_thread/Cargo.toml +++ b/servo/components/layout_thread/Cargo.toml @@ -21,7 +21,7 @@ gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} heapsize = "0.4" html5ever = "0.20.0" -ipc-channel = "0.8" +ipc-channel = "0.9" layout = {path = "../layout"} layout_traits = {path = "../layout_traits"} lazy_static = "0.2" diff --git a/servo/components/layout_traits/Cargo.toml b/servo/components/layout_traits/Cargo.toml index 6a6824463d42..872125c0d1b3 100644 --- a/servo/components/layout_traits/Cargo.toml +++ b/servo/components/layout_traits/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" [dependencies] gfx = {path = "../gfx"} -ipc-channel = "0.8" +ipc-channel = "0.9" metrics = {path = "../metrics"} msg = {path = "../msg"} net_traits = {path = "../net_traits"} diff --git a/servo/components/metrics/Cargo.toml b/servo/components/metrics/Cargo.toml index 96ce4108d32a..2420d240da21 100644 --- a/servo/components/metrics/Cargo.toml +++ b/servo/components/metrics/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} -ipc-channel = "0.8" +ipc-channel = "0.9" log = "0.3.5" msg = {path = "../msg"} profile_traits = {path = "../profile_traits"} diff --git a/servo/components/net/Cargo.toml b/servo/components/net/Cargo.toml index ef6dbe2a0303..79e4eaa47783 100644 --- a/servo/components/net/Cargo.toml +++ b/servo/components/net/Cargo.toml @@ -19,7 +19,7 @@ hyper = "0.10" hyper_serde = "0.7" hyper-openssl = "0.2.2" immeta = "0.3.1" -ipc-channel = "0.8" +ipc-channel = "0.9" lazy_static = "0.2" log = "0.3.5" matches = "0.1" diff --git a/servo/components/net_traits/Cargo.toml b/servo/components/net_traits/Cargo.toml index 198e9ac9a857..ccc080e58631 100644 --- a/servo/components/net_traits/Cargo.toml +++ b/servo/components/net_traits/Cargo.toml @@ -16,7 +16,7 @@ heapsize_derive = "0.1" hyper = "0.10" hyper_serde = "0.7" image = "0.16" -ipc-channel = "0.8" +ipc-channel = "0.9" lazy_static = "0.2" log = "0.3.5" msg = {path = "../msg"} diff --git a/servo/components/profile/Cargo.toml b/servo/components/profile/Cargo.toml index a02914db61d1..d00c0f5000dc 100644 --- a/servo/components/profile/Cargo.toml +++ b/servo/components/profile/Cargo.toml @@ -15,7 +15,7 @@ unstable = [] [dependencies] profile_traits = {path = "../profile_traits"} influent = "0.4" -ipc-channel = "0.8" +ipc-channel = "0.9" heartbeats-simple = "0.4" log = "0.3.5" serde = "1.0" diff --git a/servo/components/profile_traits/Cargo.toml b/servo/components/profile_traits/Cargo.toml index 67af6697aeae..1f6680865672 100644 --- a/servo/components/profile_traits/Cargo.toml +++ b/servo/components/profile_traits/Cargo.toml @@ -15,7 +15,7 @@ energy-profiling = ["energymon", "energy-monitor"] [dependencies] energy-monitor = {version = "0.2.0", optional = true} energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true} -ipc-channel = "0.8" +ipc-channel = "0.9" log = "0.3.5" serde = "1.0" servo_config = {path = "../config"} diff --git a/servo/components/script/Cargo.toml b/servo/components/script/Cargo.toml index 6ae95d2fda04..9bb7f932cd49 100644 --- a/servo/components/script/Cargo.toml +++ b/servo/components/script/Cargo.toml @@ -49,7 +49,7 @@ html5ever = {version = "0.20", features = ["heap_size"]} hyper = "0.10" hyper_serde = "0.7" image = "0.16" -ipc-channel = "0.8" +ipc-channel = "0.9" js = {git = "https://github.com/servo/rust-mozjs", features = ["promises"]} jstraceable_derive = {path = "../jstraceable_derive"} lazy_static = "0.2" diff --git a/servo/components/script_layout_interface/Cargo.toml b/servo/components/script_layout_interface/Cargo.toml index 9dfad06a89cf..47e47222c7d2 100644 --- a/servo/components/script_layout_interface/Cargo.toml +++ b/servo/components/script_layout_interface/Cargo.toml @@ -19,7 +19,7 @@ gfx_traits = {path = "../gfx_traits"} heapsize = "0.4" heapsize_derive = "0.1" html5ever = "0.20.0" -ipc-channel = "0.8" +ipc-channel = "0.9" libc = "0.2" log = "0.3.5" metrics = {path = "../metrics"} diff --git a/servo/components/script_traits/Cargo.toml b/servo/components/script_traits/Cargo.toml index 3e957cf29aed..88fb50c33848 100644 --- a/servo/components/script_traits/Cargo.toml +++ b/servo/components/script_traits/Cargo.toml @@ -20,7 +20,7 @@ heapsize = "0.4" heapsize_derive = "0.1" hyper = "0.10" hyper_serde = "0.7" -ipc-channel = "0.8" +ipc-channel = "0.9" libc = "0.2" msg = {path = "../msg"} net_traits = {path = "../net_traits"} diff --git a/servo/components/servo/Cargo.toml b/servo/components/servo/Cargo.toml index 3f7f3c825983..70e1a6c9000d 100644 --- a/servo/components/servo/Cargo.toml +++ b/servo/components/servo/Cargo.toml @@ -39,7 +39,7 @@ env_logger = "0.4" euclid = "0.15" gfx = {path = "../gfx"} gleam = "0.4" -ipc-channel = "0.8" +ipc-channel = "0.9" layout_thread = {path = "../layout_thread"} log = "0.3" msg = {path = "../msg"} diff --git a/servo/components/webdriver_server/Cargo.toml b/servo/components/webdriver_server/Cargo.toml index 86df911fa7ca..7c51bf6a7ea9 100644 --- a/servo/components/webdriver_server/Cargo.toml +++ b/servo/components/webdriver_server/Cargo.toml @@ -15,7 +15,7 @@ cookie = "0.6" euclid = "0.15" hyper = "0.10" image = "0.16" -ipc-channel = "0.8" +ipc-channel = "0.9" log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} diff --git a/servo/components/webvr/Cargo.toml b/servo/components/webvr/Cargo.toml index 15622da20ad8..c3a5d56b397a 100644 --- a/servo/components/webvr/Cargo.toml +++ b/servo/components/webvr/Cargo.toml @@ -16,7 +16,7 @@ oculusvr = ['rust-webvr/oculusvr'] [dependencies] canvas_traits = {path = "../canvas_traits"} euclid = "0.15" -ipc-channel = "0.8" +ipc-channel = "0.9" log = "0.3" msg = {path = "../msg"} rust-webvr = {version = "0.9", features = ["openvr"]} diff --git a/servo/components/webvr_traits/Cargo.toml b/servo/components/webvr_traits/Cargo.toml index 8e1b98f058ec..2582d2a3e4b5 100644 --- a/servo/components/webvr_traits/Cargo.toml +++ b/servo/components/webvr_traits/Cargo.toml @@ -10,7 +10,7 @@ name = "webvr_traits" path = "lib.rs" [dependencies] -ipc-channel = "0.8" +ipc-channel = "0.9" msg = {path = "../msg"} rust-webvr-api = {version = "0.9", features = ["serde-serialization"]} serde = "1.0" diff --git a/servo/tests/unit/gfx/Cargo.toml b/servo/tests/unit/gfx/Cargo.toml index da081e341ff8..b759f13422e8 100644 --- a/servo/tests/unit/gfx/Cargo.toml +++ b/servo/tests/unit/gfx/Cargo.toml @@ -12,5 +12,5 @@ doctest = false [dependencies] cssparser = "0.22.0" gfx = {path = "../../../components/gfx"} -ipc-channel = "0.8" +ipc-channel = "0.9" style = {path = "../../../components/style"} diff --git a/servo/tests/unit/metrics/Cargo.toml b/servo/tests/unit/metrics/Cargo.toml index 4cf1c52991f8..3c5aabccb2ec 100644 --- a/servo/tests/unit/metrics/Cargo.toml +++ b/servo/tests/unit/metrics/Cargo.toml @@ -13,7 +13,7 @@ doctest = false euclid = "0.15" gfx = {path = "../../../components/gfx"} gfx_traits = {path = "../../../components/gfx_traits"} -ipc-channel = "0.8" +ipc-channel = "0.9" metrics = {path = "../../../components/metrics"} msg = {path = "../../../components/msg"} net_traits = {path = "../../../components/net_traits"} diff --git a/servo/tests/unit/net/Cargo.toml b/servo/tests/unit/net/Cargo.toml index f48abf6bb47e..6c50275cfad8 100644 --- a/servo/tests/unit/net/Cargo.toml +++ b/servo/tests/unit/net/Cargo.toml @@ -16,7 +16,7 @@ flate2 = "0.2.0" hyper = "0.10" hyper-openssl = "0.2" hyper_serde = "0.7" -ipc-channel = "0.8" +ipc-channel = "0.9" msg = {path = "../../../components/msg"} net = {path = "../../../components/net"} net_traits = {path = "../../../components/net_traits"} diff --git a/servo/tests/unit/profile/Cargo.toml b/servo/tests/unit/profile/Cargo.toml index b52b947696ac..36dbeb8ffb14 100644 --- a/servo/tests/unit/profile/Cargo.toml +++ b/servo/tests/unit/profile/Cargo.toml @@ -10,6 +10,6 @@ path = "lib.rs" doctest = false [dependencies] -ipc-channel = "0.8" +ipc-channel = "0.9" profile = {path = "../../../components/profile"} profile_traits = {path = "../../../components/profile_traits"}