Auto merge of #17352 - glennw:update-wr-faster-text, r=emilio

Update WR (CPU text optimizations, image format renames).

<!-- 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/17352)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-06-16 01:21:05 -07:00 committed by GitHub
commit e1bce24129
9 changed files with 39 additions and 39 deletions

54
Cargo.lock generated
View file

@ -322,7 +322,7 @@ dependencies = [
"num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"offscreen_gl_context 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -336,7 +336,7 @@ dependencies = [
"ipc-channel 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -487,8 +487,8 @@ dependencies = [
"servo_url 0.0.1",
"style_traits 0.0.1",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender 0.42.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -525,7 +525,7 @@ dependencies = [
"servo_remutex 0.0.1",
"servo_url 0.0.1",
"style_traits 0.0.1",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
]
@ -763,7 +763,7 @@ dependencies = [
"servo_geometry 0.0.1",
"servo_url 0.0.1",
"style_traits 0.0.1",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
"x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1063,7 +1063,7 @@ dependencies = [
"truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
"xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"xml5ever 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1144,7 +1144,7 @@ dependencies = [
"servo_url 0.0.1",
"style_traits 0.0.1",
"user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1449,7 +1449,7 @@ dependencies = [
"style_traits 0.0.1",
"unicode-bidi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1490,7 +1490,7 @@ dependencies = [
"servo_geometry 0.0.1",
"servo_url 0.0.1",
"style 0.0.1",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1504,7 +1504,7 @@ dependencies = [
"profile_traits 0.0.1",
"script_traits 0.0.1",
"servo_url 0.0.1",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1580,8 +1580,8 @@ dependencies = [
"style 0.0.1",
"style_traits 0.0.1",
"webdriver_server 0.0.1",
"webrender 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender 0.42.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
"webvr 0.0.1",
"webvr_traits 0.0.1",
]
@ -1744,7 +1744,7 @@ dependencies = [
"heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1788,7 +1788,7 @@ dependencies = [
"unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1847,7 +1847,7 @@ dependencies = [
"servo_url 0.0.1",
"url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2436,7 +2436,7 @@ dependencies = [
"url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
"webvr 0.0.1",
"webvr_traits 0.0.1",
"xml5ever 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2466,7 +2466,7 @@ dependencies = [
"selectors 0.19.0",
"servo_url 0.0.1",
"style 0.0.1",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2512,7 +2512,7 @@ dependencies = [
"style_traits 0.0.1",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
]
@ -3357,8 +3357,8 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.40.0"
source = "git+https://github.com/servo/webrender#181759db5be23d05b6dab273db36475edde18bdc"
version = "0.42.0"
source = "git+https://github.com/servo/webrender#891670e5233650843d6189d1b72f202da3837ae8"
dependencies = [
"app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3381,13 +3381,13 @@ dependencies = [
"rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_profiler 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
]
[[package]]
name = "webrender_traits"
version = "0.40.0"
source = "git+https://github.com/servo/webrender#181759db5be23d05b6dab273db36475edde18bdc"
version = "0.42.0"
source = "git+https://github.com/servo/webrender#891670e5233650843d6189d1b72f202da3837ae8"
dependencies = [
"app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3414,7 +3414,7 @@ dependencies = [
"msg 0.0.1",
"script_traits 0.0.1",
"servo_config 0.0.1",
"webrender_traits 0.40.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.42.0 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
]
@ -3789,8 +3789,8 @@ dependencies = [
"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
"checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff"
"checksum webdriver 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d548aabf87411b1b4ba91fd07eacd8b238135c7131a452b8a9f6386209167e18"
"checksum webrender 0.40.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_traits 0.40.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender 0.42.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_traits 0.42.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
"checksum ws 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04614a58714f3fd4a8b1da4bcae9f031c532d35988c3d39627619248113f8be8"