Auto merge of #18840 - glennw:update-wr, r=jdm

Update WR (fontconfig options, DL optimizations, isolate fixes).

<!-- 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/18840)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-12 17:57:43 -05:00 committed by GitHub
commit 428ef1111f
3 changed files with 37 additions and 35 deletions

66
Cargo.lock generated
View file

@ -149,7 +149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "bincode"
version = "0.8.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -312,8 +312,8 @@ dependencies = [
"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)",
"webrender 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -329,7 +329,7 @@ dependencies = [
"offscreen_gl_context 0.11.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",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -479,8 +479,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.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -516,7 +516,7 @@ dependencies = [
"servo_remutex 0.0.1",
"servo_url 0.0.1",
"style_traits 0.0.1",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
]
@ -791,7 +791,7 @@ dependencies = [
"servo_geometry 0.0.1",
"servo_url 0.0.1",
"style_traits 0.0.1",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1115,7 +1115,7 @@ dependencies = [
"truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"xml5ever 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1196,7 +1196,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_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (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)",
]
@ -1420,7 +1420,7 @@ name = "ipc-channel"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.1 (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)",
@ -1533,7 +1533,7 @@ dependencies = [
"style_traits 0.0.1",
"unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1580,7 +1580,7 @@ dependencies = [
"servo_url 0.0.1",
"style 0.0.1",
"style_traits 0.0.1",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1595,7 +1595,7 @@ dependencies = [
"profile_traits 0.0.1",
"script_traits 0.0.1",
"servo_url 0.0.1",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1679,8 +1679,8 @@ dependencies = [
"style 0.0.1",
"style_traits 0.0.1",
"webdriver_server 0.0.1",
"webrender 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender 0.52.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webvr 0.0.1",
"webvr_traits 0.0.1",
]
@ -1907,7 +1907,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)",
"serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1965,7 +1965,7 @@ dependencies = [
"unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2022,7 +2022,7 @@ dependencies = [
"servo_url 0.0.1",
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2640,7 +2640,7 @@ dependencies = [
"url 1.5.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.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
"xml5ever 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -2672,7 +2672,7 @@ dependencies = [
"servo_atoms 0.0.1",
"servo_url 0.0.1",
"style 0.0.1",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2716,7 +2716,7 @@ dependencies = [
"style_traits 0.0.1",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
]
@ -3215,7 +3215,7 @@ dependencies = [
"serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_arc 0.0.1",
"servo_atoms 0.0.1",
"webrender_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -3586,11 +3586,11 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.52.0"
source = "git+https://github.com/servo/webrender#faa9cfe116aa7b536623551ed3c97cdd427263b9"
version = "0.52.1"
source = "git+https://github.com/servo/webrender#717d29831344c753009eba8c550914484e3bc91f"
dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.1 (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)",
@ -3609,16 +3609,16 @@ dependencies = [
"rayon 0.8.2 (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_api 0.52.0 (git+https://github.com/servo/webrender)",
"webrender_api 0.52.1 (git+https://github.com/servo/webrender)",
]
[[package]]
name = "webrender_api"
version = "0.52.0"
source = "git+https://github.com/servo/webrender#faa9cfe116aa7b536623551ed3c97cdd427263b9"
version = "0.52.1"
source = "git+https://github.com/servo/webrender#717d29831344c753009eba8c550914484e3bc91f"
dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.1 (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)",
@ -3765,7 +3765,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.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e103c8b299b28a9c6990458b7013dc4a8356a9b854c51b9883241f5866fac36e"
"checksum bincode 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e4a2d3bab374f96192eade8f41914373d7b5fcf030ca2f45141f1e939057259"
"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"
@ -4033,8 +4033,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.52.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_api 0.52.0 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender 0.52.1 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_api 0.52.1 (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"

View file

@ -0,0 +1,3 @@
[css-transforms-3d-on-anonymous-block-001.htm]
type: reftest
expected: FAIL

View file

@ -1,4 +1,3 @@
[transform-input-018.htm]
type: reftest
expected:
if os == "linux": FAIL
expected: FAIL