servo: Merge #19236 - Update WR (hit test fix, render target pool optimizations, picture tree) (from glennw:update-wr-pic); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: fa61bfb83a7d7d9160e0384bb651e9b019c206ce

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 9f19fbb791a95b70f318041c69a61cd2f7db7a75
This commit is contained in:
Glenn Watson 2017-11-16 15:11:10 -06:00
parent 7a02ba997f
commit 89cd3c967e

58
servo/Cargo.lock generated
View File

@ -297,8 +297,8 @@ dependencies = [
"num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"offscreen_gl_context 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_config 0.0.1",
"webrender 0.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender 0.53.2 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -315,7 +315,7 @@ dependencies = [
"offscreen_gl_context 0.13.0 (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.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -472,8 +472,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.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender 0.53.2 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -509,7 +509,7 @@ dependencies = [
"servo_remutex 0.0.1",
"servo_url 0.0.1",
"style_traits 0.0.1",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
]
@ -802,7 +802,7 @@ dependencies = [
"servo_geometry 0.0.1",
"servo_url 0.0.1",
"style_traits 0.0.1",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
"x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1090,7 +1090,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.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
"xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"xml5ever 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1171,7 +1171,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.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (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)",
]
@ -1500,7 +1500,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.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1550,7 +1550,7 @@ dependencies = [
"servo_url 0.0.1",
"style 0.0.1",
"style_traits 0.0.1",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1565,7 +1565,7 @@ dependencies = [
"profile_traits 0.0.1",
"script_traits 0.0.1",
"servo_url 0.0.1",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1649,8 +1649,8 @@ dependencies = [
"style 0.0.1",
"style_traits 0.0.1",
"webdriver_server 0.0.1",
"webrender 0.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender 0.53.2 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
"webvr 0.0.1",
"webvr_traits 0.0.1",
]
@ -1703,7 +1703,7 @@ dependencies = [
"smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
"xml5ever 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1921,7 +1921,7 @@ dependencies = [
"malloc_size_of_derive 0.0.1",
"nonzero 0.0.1",
"serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -1979,7 +1979,7 @@ dependencies = [
"unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.6.0 (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.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2036,7 +2036,7 @@ dependencies = [
"servo_url 0.0.1",
"url 1.6.0 (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.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2659,7 +2659,7 @@ dependencies = [
"url 1.6.0 (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.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
"xml5ever 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -2692,7 +2692,7 @@ dependencies = [
"servo_atoms 0.0.1",
"servo_url 0.0.1",
"style 0.0.1",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -2736,7 +2736,7 @@ dependencies = [
"style_traits 0.0.1",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_api 0.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
"webvr_traits 0.0.1",
]
@ -3249,7 +3249,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.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
@ -3633,8 +3633,8 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.53.1"
source = "git+https://github.com/servo/webrender#30413c20684b4c8d82baf9e1296f9e10189c3591"
version = "0.53.2"
source = "git+https://github.com/servo/webrender#6dba5ed000b0c08e507390fff09ef4a134222cf0"
dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3655,13 +3655,13 @@ 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.53.1 (git+https://github.com/servo/webrender)",
"webrender_api 0.53.2 (git+https://github.com/servo/webrender)",
]
[[package]]
name = "webrender_api"
version = "0.53.1"
source = "git+https://github.com/servo/webrender#30413c20684b4c8d82baf9e1296f9e10189c3591"
version = "0.53.2"
source = "git+https://github.com/servo/webrender#6dba5ed000b0c08e507390fff09ef4a134222cf0"
dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -4100,8 +4100,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.53.1 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_api 0.53.1 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender 0.53.2 (git+https://github.com/servo/webrender)" = "<none>"
"checksum webrender_api 0.53.2 (git+https://github.com/servo/webrender)" = "<none>"
"checksum which 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4be6cfa54dab45266e98b5d7be2f8ce959ddd49abd141a05d52dce4b07f803bb"
"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"