Auto merge of #23516 - pcwalton:webrenderup, r=pcwalton,jdm

Upgrade WebRender

This is against an old Servo because I can't build current Servo due to compile errors in RNG crates. I verified that it starts up.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #23516
- [x] There are tests for these changes

<!-- 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/23516)
<!-- Reviewable:end -->

Cargo.lock

@@ -83,7 +83,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -161,7 +161,7 @@ dependencies = [
  "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "unwind-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -206,7 +206,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -282,7 +282,7 @@ dependencies = [
  "embedder_traits 0.0.1",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -398,7 +398,7 @@ dependencies = [
  "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -408,8 +408,8 @@ dependencies = [
  "raqote 0.4.1-alpha.0 (git+https://github.com/jrmuizel/raqote)",
  "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
- "webrender 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender 0.60.0 (git+https://github.com/servo/webrender)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "webrender_traits 0.0.1",
 ]
 
@@ -419,17 +419,17 @@ version = "0.0.1"
 dependencies = [
  "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "malloc_size_of 0.0.1",
  "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pixels 0.0.1",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
  "typetag 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "webvr_traits 0.0.1",
  "webxr-api 0.0.1 (git+https://github.com/servo/webxr)",
 ]
@@ -450,8 +450,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -486,7 +486,7 @@ name = "cgl"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -599,7 +599,7 @@ dependencies = [
  "embedder_traits 0.0.1",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -617,8 +617,8 @@ dependencies = [
  "style_traits 0.0.1",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender 0.60.0 (git+https://github.com/servo/webrender)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "webvr 0.0.1",
  "webvr_traits 0.0.1",
  "webxr-api 0.0.1 (git+https://github.com/servo/webxr)",
@@ -655,14 +655,14 @@ dependencies = [
  "net_traits 0.0.1",
  "profile_traits 0.0.1",
  "script_traits 0.0.1",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
  "servo_geometry 0.0.1",
  "servo_rand 0.0.1",
  "servo_remutex 0.0.1",
  "servo_url 0.0.1",
  "style_traits 0.0.1",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "webvr_traits 0.0.1",
  "webxr-api 0.0.1 (git+https://github.com/servo/webxr)",
 ]
@@ -824,7 +824,7 @@ dependencies = [
  "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "procedural-masquerade 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -999,7 +999,7 @@ dependencies = [
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1015,7 +1015,7 @@ dependencies = [
  "malloc_size_of 0.0.1",
  "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_url 0.0.1",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1080,18 +1080,6 @@ dependencies = [
  "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "dwrote"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "dwrote"
 version = "0.9.0"
@@ -1099,6 +1087,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1119,10 +1109,10 @@ dependencies = [
  "msg 0.0.1",
  "num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_url 0.0.1",
  "style_traits 0.0.1",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1210,7 +1200,7 @@ name = "erased-serde"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1228,7 +1218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "euclid_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1435,7 +1425,7 @@ dependencies = [
  "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dwrote 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dwrote 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "fontsan 0.4.0 (git+https://github.com/servo/fontsan)",
@@ -1451,7 +1441,7 @@ dependencies = [
  "ordered-float 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "packed_simd 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "range 0.0.1",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_allocator 0.0.1",
  "servo_arc 0.1.1",
@@ -1464,7 +1454,7 @@ dependencies = [
  "ucd 0.1.1 (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.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "xml5ever 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1476,7 +1466,7 @@ dependencies = [
  "malloc_size_of 0.0.1",
  "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "range 0.0.1",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1520,7 +1510,7 @@ dependencies = [
 
 [[package]]
 name = "gleam"
-version = "0.6.16"
+version = "0.6.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2107,7 +2097,7 @@ dependencies = [
  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2209,7 +2199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2235,7 +2225,7 @@ dependencies = [
  "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.18 (git+https://github.com/servo/mio.git?branch=servo)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2304,7 +2294,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2344,7 +2334,7 @@ dependencies = [
  "script_layout_interface 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.21.0",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_arc 0.1.1",
  "servo_atoms 0.0.1",
@@ -2357,7 +2347,7 @@ dependencies = [
  "style_traits 0.0.1",
  "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-script 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2411,7 +2401,7 @@ dependencies = [
  "style 0.0.1",
  "style_traits 0.0.1",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -2432,7 +2422,7 @@ dependencies = [
  "script_traits 0.0.1",
  "servo_geometry 0.0.1",
  "servo_url 0.0.1",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -2450,7 +2440,7 @@ dependencies = [
  "script_traits 0.0.1",
  "servo_geometry 0.0.1",
  "servo_url 0.0.1",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -2541,7 +2531,7 @@ dependencies = [
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "gaol 0.2.0 (git+https://github.com/servo/gaol)",
  "gfx 0.0.1",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "layout_thread_2013 0.0.1",
@@ -2566,8 +2556,8 @@ dependencies = [
  "style 0.0.1",
  "style_traits 0.0.1",
  "webdriver_server 0.0.1",
- "webrender 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender 0.60.0 (git+https://github.com/servo/webrender)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "webrender_traits 0.0.1",
  "webvr 0.0.1",
  "webvr_traits 0.0.1",
@@ -2688,7 +2678,7 @@ dependencies = [
  "hyper_serde 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.21.0",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_arc 0.1.1",
  "smallbitvec 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2698,7 +2688,7 @@ dependencies = [
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "xml5ever 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2728,8 +2718,8 @@ dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2750,11 +2740,11 @@ dependencies = [
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo-media 0.1.0 (git+https://github.com/servo/media)",
  "servo_config 0.0.1",
- "webrender 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender 0.60.0 (git+https://github.com/servo/webrender)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "webrender_traits 0.0.1",
 ]
 
@@ -2815,7 +2805,7 @@ dependencies = [
  "profile_traits 0.0.1",
  "servo_url 0.0.1",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -2966,9 +2956,9 @@ version = "0.0.1"
 dependencies = [
  "malloc_size_of 0.0.1",
  "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "size_of_test 0.0.1",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -3011,7 +3001,7 @@ dependencies = [
  "pixels 0.0.1",
  "profile_traits 0.0.1",
  "rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_allocator 0.0.1",
  "servo_arc 0.1.1",
@@ -3025,7 +3015,7 @@ dependencies = [
  "tokio-timer 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "ws 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3060,7 +3050,7 @@ dependencies = [
  "msg 0.0.1",
  "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "pixels 0.0.1",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_arc 0.1.1",
  "servo_config 0.0.1",
  "servo_url 0.0.1",
@@ -3068,7 +3058,7 @@ dependencies = [
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -3201,13 +3191,13 @@ dependencies = [
  "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11 2.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3416,7 +3406,7 @@ dependencies = [
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "malloc_size_of 0.0.1",
  "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3490,7 +3480,7 @@ dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "profile_traits 0.0.1",
  "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_allocator 0.0.1",
  "servo_config 0.0.1",
@@ -3519,7 +3509,7 @@ dependencies = [
  "energymon 0.3.0 (git+https://github.com/energymon/energymon-rust.git)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
  "signpost 0.1.0 (git+https://github.com/pcwalton/signpost.git)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3653,7 +3643,7 @@ dependencies = [
  "malloc_size_of 0.0.1",
  "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3753,7 +3743,7 @@ name = "ron"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3764,7 +3754,7 @@ dependencies = [
  "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gvr-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3780,10 +3770,10 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "android_injected_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3865,7 +3855,7 @@ dependencies = [
  "enum-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "headers 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3905,7 +3895,7 @@ dependencies = [
  "script_plugins 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.21.0",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo-media 0.1.0 (git+https://github.com/servo/media)",
@@ -3928,7 +3918,7 @@ dependencies = [
  "url 1.7.2 (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.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "webvr_traits 0.0.1",
  "webxr-api 0.0.1 (git+https://github.com/servo/webxr)",
  "xml5ever 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3962,7 +3952,7 @@ dependencies = [
  "servo_url 0.0.1",
  "style 0.0.1",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -4014,13 +4004,13 @@ dependencies = [
  "net_traits 0.0.1",
  "pixels 0.0.1",
  "profile_traits 0.0.1",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_atoms 0.0.1",
  "servo_url 0.0.1",
  "style_traits 0.0.1",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
  "webvr_traits 0.0.1",
  "webxr-api 0.0.1 (git+https://github.com/servo/webxr)",
 ]
@@ -4060,10 +4050,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.80"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -4071,12 +4061,12 @@ name = "serde_bytes"
 version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.80"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4092,7 +4082,7 @@ dependencies = [
  "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -4105,7 +4095,7 @@ dependencies = [
  "clipboard 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4184,8 +4174,8 @@ dependencies = [
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo-media-traits 0.1.0 (git+https://github.com/servo/media)",
  "servo_media_derive 0.1.0 (git+https://github.com/servo/media)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4270,8 +4260,8 @@ version = "0.1.0"
 source = "git+https://github.com/servo/media#ae9d071e72cef4bbf1aaf54004007c7047b2d4b6"
 dependencies = [
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo-media-streams 0.1.0 (git+https://github.com/servo/media)",
  "servo-media-traits 0.1.0 (git+https://github.com/servo/media)",
 ]
@@ -4309,7 +4299,7 @@ dependencies = [
  "cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "expat-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "glx 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "io-surface 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4333,7 +4323,7 @@ name = "servo_arc"
 version = "0.1.1"
 dependencies = [
  "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -4357,8 +4347,8 @@ dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config_plugins 0.0.1",
  "servo_geometry 0.0.1",
@@ -4386,7 +4376,7 @@ dependencies = [
  "malloc_size_of 0.0.1",
  "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "style_traits 0.0.1",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -4423,7 +4413,7 @@ version = "0.0.1"
 dependencies = [
  "malloc_size_of 0.0.1",
  "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_rand 0.0.1",
  "to_shmem 0.0.1",
  "to_shmem_derive 0.0.1",
@@ -4443,11 +4433,6 @@ dependencies = [
  "opaque-debug 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "sha2"
 version = "0.8.0"
@@ -4548,7 +4533,7 @@ name = "smallvec"
 version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -4612,7 +4597,7 @@ dependencies = [
  "new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -4678,7 +4663,7 @@ dependencies = [
  "rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.21.0",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_arc 0.1.1",
  "servo_atoms 0.0.1",
  "servo_config 0.0.1",
@@ -4746,15 +4731,20 @@ dependencies = [
  "malloc_size_of 0.0.1",
  "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.21.0",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_arc 0.1.1",
  "servo_atoms 0.0.1",
  "servo_url 0.0.1",
  "to_shmem 0.0.1",
  "to_shmem_derive 0.0.1",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
+[[package]]
+name = "svg_fmt"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "sw-composite"
 version = "0.5.3"
@@ -4901,7 +4891,7 @@ name = "to_shmem"
 version = "0.0.1"
 dependencies = [
  "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_arc 0.1.1",
  "smallbitvec 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5087,7 +5077,7 @@ name = "toml"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -5118,7 +5108,7 @@ dependencies = [
  "erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "inventory 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "typetag-impl 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -5172,8 +5162,8 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -5236,7 +5226,7 @@ name = "url_serde"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -5259,7 +5249,7 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -5366,8 +5356,8 @@ dependencies = [
  "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5393,7 +5383,7 @@ dependencies = [
  "pixels 0.0.1",
  "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
  "servo_url 0.0.1",
@@ -5405,9 +5395,8 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.60.0"
-source = "git+https://github.com/jdm/webrender?branch=servo-hl#005b785bfa91cff265077b4b9c4dafea8768b526"
+source = "git+https://github.com/servo/webrender#2afa0c3ba85d2f6b219a1349268d1250760ebd64"
 dependencies = [
- "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5417,10 +5406,11 @@ dependencies = [
  "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cstr 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "dwrote 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dwrote 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "freetype 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5430,22 +5420,23 @@ dependencies = [
  "plane-split 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "svg_fmt 0.4.0 (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.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
- "webrender_build 0.0.1 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_build 0.0.1 (git+https://github.com/servo/webrender)",
- "wr_malloc_size_of 0.0.1 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "wr_malloc_size_of 0.0.1 (git+https://github.com/servo/webrender)",
- "ws 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ws 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "webrender_api"
 version = "0.60.0"
-source = "git+https://github.com/jdm/webrender?branch=servo-hl#005b785bfa91cff265077b4b9c4dafea8768b526"
+source = "git+https://github.com/servo/webrender#2afa0c3ba85d2f6b219a1349268d1250760ebd64"
 dependencies = [
  "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5457,17 +5448,17 @@ dependencies = [
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "wr_malloc_size_of 0.0.1 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "wr_malloc_size_of 0.0.1 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
 name = "webrender_build"
 version = "0.0.1"
-source = "git+https://github.com/jdm/webrender?branch=servo-hl#005b785bfa91cff265077b4b9c4dafea8768b526"
+source = "git+https://github.com/servo/webrender#2afa0c3ba85d2f6b219a1349268d1250760ebd64"
 dependencies = [
  "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -5477,8 +5468,8 @@ name = "webrender_traits"
 version = "0.0.1"
 dependencies = [
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender 0.60.0 (git+https://github.com/servo/webrender)",
- "webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)",
+ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -5488,7 +5479,7 @@ dependencies = [
  "canvas_traits 0.0.1",
  "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
@@ -5506,7 +5497,7 @@ dependencies = [
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "rust-webvr-api 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -5515,7 +5506,7 @@ version = "0.0.1"
 source = "git+https://github.com/servo/webxr#3951634a06e2f9417f04e8ada969589f5b8a01d2"
 dependencies = [
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "webxr-api 0.0.1 (git+https://github.com/servo/webxr)",
 ]
@@ -5526,9 +5517,9 @@ version = "0.0.1"
 source = "git+https://github.com/servo/webxr#3951634a06e2f9417f04e8ada969589f5b8a01d2"
 dependencies = [
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "typetag 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -5619,29 +5610,12 @@ dependencies = [
 [[package]]
 name = "wr_malloc_size_of"
 version = "0.0.1"
-source = "git+https://github.com/jdm/webrender?branch=servo-hl#005b785bfa91cff265077b4b9c4dafea8768b526"
+source = "git+https://github.com/servo/webrender#2afa0c3ba85d2f6b219a1349268d1250760ebd64"
 dependencies = [
  "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "ws"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.18 (git+https://github.com/servo/mio.git?branch=servo)",
- "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "ws"
 version = "0.8.1"
@@ -5831,7 +5805,6 @@ dependencies = [
 "checksum downcast-rs 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "18df8ce4470c189d18aa926022da57544f31e154631eb4cfe796aea97051fe6c"
 "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"
 "checksum dtoa-short 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe6f727b406462fd57c95fed84d1b0dbfb5f0136fcac005adba9ea0367c05cc8"
-"checksum dwrote 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c31c624339dab99c223a4b26c2e803b7c248adaca91549ce654c76f39a03f5c8"
 "checksum dwrote 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0bd1369e02db5e9b842a9b67bce8a2fcc043beafb2ae8a799dd482d46ea1ff0d"
 "checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a"
 "checksum encoding_rs 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ca20350a7cb5aab5b9034731123d6d412caf3e92d4985e739e411ba0955fd0eb"
@@ -5873,7 +5846,7 @@ dependencies = [
 "checksum gif 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff3414b424657317e708489d2857d9575f4403698428b040b609b9d1c1a84a2c"
 "checksum gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0ffaf173cf76c73a73e080366bf556b4776ece104b06961766ff11449f38604"
 "checksum gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39a23d5e872a275135d66895d954269cf5e8661d234eb1c2480f4ce0d586acbd"
-"checksum gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "39bb69499005e11b7b7cc0af38404a1bc0f53d954bffa8adcdb6e8d5b14f75d5"
+"checksum gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7f46fd8874e043ffac0d638ed1567a2584f7814f6d72b4db37ab1689004a26c4"
 "checksum glib 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d70d737019da0473a7cd6d9240571cf58c6897dcb10edf32b90774f4ba237c1b"
 "checksum glib-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4b86a9169fbc9cf9a0ef315039c2304b09d5c575c5fde7defba3576a0311b863"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
@@ -6069,9 +6042,9 @@ dependencies = [
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)" = "15c141fc7027dd265a47c090bf864cf62b42c4d228bbcf4e51a0c9e2b0d3f7ef"
+"checksum serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)" = "9f301d728f2b94c9a7691c90f07b0b4e8a4517181d9461be94c04bddeb4bd850"
 "checksum serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adb6e51a6b3696b301bc221d785f898b4457c619b51d7ce195a6d20baecb37b3"
-"checksum serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)" = "225de307c6302bec3898c51ca302fc94a7a1697ef0845fcee6448f33c032249c"
+"checksum serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)" = "beed18e6f5175aef3ba670e57c60ef3b1b74d250d962a26604bff4c80e970dd4"
 "checksum serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "5c508584d9913df116b91505eec55610a2f5b16e9ed793c46e4d0152872b3e74"
 "checksum servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21069a884c33fe6ee596975e1f3849ed88c4ec857fbaf11d33672d8ebe051217"
 "checksum servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a088f8d775a5c5314aae09bd77340bc9c67d72b9a45258be34c83548b4814cd9"
@@ -6090,7 +6063,6 @@ dependencies = [
 "checksum servo-skia 0.30000021.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f6c0a65022054874fc1f38dc45e19192accbae775784c3ff05c3875bcc176c19"
 "checksum servo_media_derive 0.1.0 (git+https://github.com/servo/media)" = "<none>"
 "checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"
-"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
 "checksum shared_library 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8254bf098ce4d8d7cc7cc6de438c5488adc5297e5b7ffef88816c0a91bd289c1"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
@@ -6109,6 +6081,7 @@ dependencies = [
 "checksum string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da"
 "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
 "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
+"checksum svg_fmt 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c666f0fed8e1e20e057af770af9077d72f3d5a33157b8537c1475dd8ffd6d32b"
 "checksum sw-composite 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1638f200d9594cad22e9e58baf046382d8f5a38d40878db1705dcaeae239093"
 "checksum swapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e454d048db5527d000bfddb77bd072bbf3a1e2ae785f16d9bd116e07c2ab45eb"
 "checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe"
@@ -6175,9 +6148,9 @@ dependencies = [
 "checksum wayland-scanner 0.21.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f1927ee62e4e149c010dc9eca8ca47e238416cd6f45f688eb9f8a8e9c3794c30"
 "checksum wayland-sys 0.21.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ca41ed78a12256f81df6f53fcbe4503213ba442e02cdad3c9c888a64a668eaf4"
 "checksum webdriver 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0533b0b0a05e2e5c081317759a038482806c6085c9605dded03c8bbd2498b042"
-"checksum webrender 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)" = "<none>"
+"checksum webrender 0.60.0 (git+https://github.com/servo/webrender)" = "<none>"
-"checksum webrender_api 0.60.0 (git+https://github.com/jdm/webrender?branch=servo-hl)" = "<none>"
+"checksum webrender_api 0.60.0 (git+https://github.com/servo/webrender)" = "<none>"
-"checksum webrender_build 0.0.1 (git+https://github.com/jdm/webrender?branch=servo-hl)" = "<none>"
+"checksum webrender_build 0.0.1 (git+https://github.com/servo/webrender)" = "<none>"
 "checksum webxr 0.0.1 (git+https://github.com/servo/webxr)" = "<none>"
 "checksum webxr-api 0.0.1 (git+https://github.com/servo/webxr)" = "<none>"
 "checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"
@@ -6189,8 +6162,7 @@ dependencies = [
 "checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
 "checksum winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d233301129ddd33260b47f76900b50e154b7254546e2edba0e5468a1a5fe4de3"
 "checksum winres 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "27d9192d6356d7efe8405dec6c5506b67543cf64b6049968f39f4c4623b4f25d"
-"checksum wr_malloc_size_of 0.0.1 (git+https://github.com/jdm/webrender?branch=servo-hl)" = "<none>"
+"checksum wr_malloc_size_of 0.0.1 (git+https://github.com/servo/webrender)" = "<none>"
-"checksum ws 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "329d3e6dd450a9c5c73024e1047f0be7e24121a68484eb0b5368977bee3cf8c3"
 "checksum ws 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ec91ea61b83ce033c43c06c52ddc7532f465c0153281610d44c58b74083aee1a"
 "checksum x11 2.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e5c4ac579b5d324dc4add02312b5d0e3e0218521e2d5779d526ac39ee4bb171"
 "checksum x11-clipboard 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d8617c6185c96e5fcf57ff156496d73c9c82b7f09a5fea21b518dd32c10e2e05"

Cargo.toml

@@ -29,7 +29,3 @@ opt-level = 3
 mio = { git = "https://github.com/servo/mio.git", branch = "servo" }
 iovec = { git = "https://github.com/servo/iovec.git", branch = "servo" }
 cmake = { git = "https://github.com/alexcrichton/cmake-rs" }
-
-[patch."https://github.com/servo/webrender"]
-webrender = { git = "https://github.com/jdm/webrender", branch = "servo-hl" }
-webrender_api = { git = "https://github.com/jdm/webrender", branch = "servo-hl" }

components/canvas/canvas_data.rs

@@ -941,7 +941,7 @@ impl<'a> CanvasData<'a> {
         let size = self.drawtarget.get_size();
 
         let descriptor = webrender_api::ImageDescriptor {
-            size: webrender_api::DeviceIntSize::new(size.width, size.height),
+            size: webrender_api::units::DeviceIntSize::new(size.width, size.height),
             stride: None,
             format: webrender_api::ImageFormat::BGRA8,
             offset: 0,

components/canvas/webgl_mode/inprocess.rs

@@ -159,7 +159,7 @@ impl webrender::OutputImageHandler for OutputHandler {
     fn lock(
         &mut self,
         id: webrender_api::PipelineId,
-    ) -> Option<(u32, webrender_api::FramebufferIntSize)> {
+    ) -> Option<(u32, webrender_api::units::FramebufferIntSize)> {
         // Insert a fence in the WR command queue
         let gl_sync = self
             .webrender_gl
@@ -172,7 +172,7 @@ impl webrender::OutputImageHandler for OutputHandler {
         self.lock_channel.1.recv().unwrap().map(|(tex_id, size)| {
             (
                 tex_id,
-                webrender_api::FramebufferIntSize::new(size.width, size.height),
+                webrender_api::units::FramebufferIntSize::new(size.width, size.height),
             )
         })
     }

components/canvas/webgl_thread.rs

@@ -659,7 +659,7 @@ impl<VR: WebVRRenderHandler + 'static> WebGLThread<VR> {
     /// Helper function to create a `webrender_api::ImageDescriptor`.
     fn image_descriptor(size: Size2D<i32>, alpha: bool) -> webrender_api::ImageDescriptor {
         webrender_api::ImageDescriptor {
-            size: webrender_api::DeviceIntSize::new(size.width, size.height),
+            size: webrender_api::units::DeviceIntSize::new(size.width, size.height),
             stride: None,
             format: webrender_api::ImageFormat::BGRA8,
             offset: 0,

components/compositing/compositor.rs

@@ -32,7 +32,7 @@ use script_traits::{
     MouseButton, MouseEventType, ScrollState, TouchEventType, TouchId, WheelDelta,
 };
 use script_traits::{UntrustedNodeAddress, WindowSizeData, WindowSizeType};
-use servo_geometry::DeviceIndependentPixel;
+use servo_geometry::{DeviceIndependentPixel, FramebufferUintLength};
 use std::collections::HashMap;
 use std::env;
 use std::fs::{create_dir_all, File};
@@ -42,10 +42,8 @@ use std::rc::Rc;
 use style_traits::viewport::ViewportConstraints;
 use style_traits::{CSSPixel, DevicePixel, PinchZoomFactor};
 use time::{now, precise_time_ns, precise_time_s};
-use webrender_api::{
+use webrender_api::units::{DeviceIntPoint, DeviceIntSize, DevicePoint, LayoutVector2D};
-    self, DeviceIntPoint, DevicePoint, FramebufferIntSize, HitTestFlags, HitTestResult,
+use webrender_api::{self, HitTestFlags, HitTestResult, ScrollLocation};
-};
-use webrender_api::{LayoutVector2D, ScrollLocation};
 use webvr_traits::WebVRMainThreadHeartbeat;
 
 #[derive(Debug, PartialEq)]
@@ -724,7 +722,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
         let dppx = self.page_zoom * self.hidpi_factor();
         let scaled_point = (point / dppx).to_untyped();
 
-        let world_cursor = webrender_api::WorldPoint::from_untyped(&scaled_point);
+        let world_cursor = webrender_api::units::WorldPoint::from_untyped(&scaled_point);
         self.webrender_api.hit_test(
             self.webrender_document,
             None,
@@ -844,9 +842,9 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
                 let cursor = TypedPoint2D::new(-1, -1); // Make sure this hits the base layer.
                 self.pending_scroll_zoom_events.push(ScrollZoomEvent {
                     magnification: magnification,
-                    scroll_location: ScrollLocation::Delta(
+                    scroll_location: ScrollLocation::Delta(LayoutVector2D::from_untyped(
-                        webrender_api::LayoutVector2D::from_untyped(&scroll_delta.to_untyped()),
+                        &scroll_delta.to_untyped(),
-                    ),
+                    )),
                     cursor: cursor,
                     event_count: 1,
                 });
@@ -933,9 +931,9 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
                 last_combined_event @ &mut None => {
                     *last_combined_event = Some(ScrollZoomEvent {
                         magnification: scroll_event.magnification,
-                        scroll_location: ScrollLocation::Delta(
+                        scroll_location: ScrollLocation::Delta(LayoutVector2D::from_untyped(
-                            webrender_api::LayoutVector2D::from_untyped(&this_delta.to_untyped()),
+                            &this_delta.to_untyped(),
-                        ),
+                        )),
                         cursor: this_cursor,
                         event_count: 1,
                     })
@@ -966,15 +964,14 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
                     let scaled_delta = (TypedVector2D::from_untyped(&delta.to_untyped()) /
                         self.scale)
                         .to_untyped();
-                    let calculated_delta =
+                    let calculated_delta = LayoutVector2D::from_untyped(&scaled_delta);
-                        webrender_api::LayoutVector2D::from_untyped(&scaled_delta);
                     ScrollLocation::Delta(calculated_delta)
                 },
                 // Leave ScrollLocation unchanged if it is Start or End location.
                 sl @ ScrollLocation::Start | sl @ ScrollLocation::End => sl,
             };
             let cursor = (combined_event.cursor.to_f32() / self.scale).to_untyped();
-            let cursor = webrender_api::WorldPoint::from_untyped(&cursor);
+            let cursor = webrender_api::units::WorldPoint::from_untyped(&cursor);
             let mut txn = webrender_api::Transaction::new();
             txn.scroll(scroll_location, cursor);
             if combined_event.magnification != 1.0 {
@@ -1168,8 +1165,9 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
                 let mut pipeline_epochs = HashMap::new();
                 for (id, _) in &self.pipeline_details {
                     let webrender_pipeline_id = id.to_webrender();
-                    if let Some(webrender_api::Epoch(epoch)) =
+                    if let Some(webrender_api::Epoch(epoch)) = self
-                        self.webrender.current_epoch(webrender_pipeline_id)
+                        .webrender
+                        .current_epoch(self.webrender_document, webrender_pipeline_id)
                     {
                         let epoch = Epoch(epoch);
                         pipeline_epochs.insert(*id, epoch);
@@ -1269,9 +1267,11 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
             #[cfg(feature = "gl")]
             CompositeTarget::Window => gl::RenderTargetInfo::default(),
             #[cfg(feature = "gl")]
-            CompositeTarget::WindowAndPng | CompositeTarget::PngFile => {
+            CompositeTarget::WindowAndPng | CompositeTarget::PngFile => gl::initialize_png(
-                gl::initialize_png(&*self.window.gl(), width, height)
+                &*self.window.gl(),
-            },
+                FramebufferUintLength::new(width.get()),
+                FramebufferUintLength::new(height.get()),
+            ),
             #[cfg(not(feature = "gl"))]
             _ => (),
         };
@@ -1283,7 +1283,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
             || {
                 debug!("compositor: compositing");
 
-                let size = FramebufferIntSize::from_untyped(
+                let size = DeviceIntSize::from_untyped(
                     &self.embedder_coordinates.framebuffer.to_untyped(),
                 );
 
@@ -1304,8 +1304,9 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
             // For each pending paint metrics pipeline id
             for (id, pending_epoch) in &self.pending_paint_metrics {
                 // we get the last painted frame id from webrender
-                if let Some(webrender_api::Epoch(epoch)) =
+                if let Some(webrender_api::Epoch(epoch)) = self
-                    self.webrender.current_epoch(id.to_webrender())
+                    .webrender
+                    .current_epoch(self.webrender_document, id.to_webrender())
                 {
                     // and check if it is the one the layout thread is expecting,
                     let epoch = Epoch(epoch);
@@ -1332,7 +1333,12 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
             CompositeTarget::Window => None,
             #[cfg(feature = "gl")]
             CompositeTarget::WindowAndPng => {
-                let img = gl::draw_img(&*self.window.gl(), rt_info, width, height);
+                let img = gl::draw_img(
+                    &*self.window.gl(),
+                    rt_info,
+                    FramebufferUintLength::new(width.get()),
+                    FramebufferUintLength::new(height.get()),
+                );
                 Some(Image {
                     width: img.width(),
                     height: img.height(),
@@ -1351,7 +1357,12 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
                     || match self.output_file.as_ref() {
                         Some(path) => match File::create(path) {
                             Ok(mut file) => {
-                                let img = gl::draw_img(gl, rt_info, width, height);
+                                let img = gl::draw_img(
+                                    gl,
+                                    rt_info,
+                                    FramebufferUintLength::new(width.get()),
+                                    FramebufferUintLength::new(height.get()),
+                                );
                                 let dynamic_image = DynamicImage::ImageRgb8(img);
                                 if let Err(e) = dynamic_image.write_to(&mut file, ImageFormat::PNG)
                                 {

components/compositing/compositor_thread.rs

@@ -17,7 +17,8 @@ use profile_traits::time;
 use script_traits::{AnimationState, ConstellationMsg, EventResult};
 use std::fmt::{Debug, Error, Formatter};
 use style_traits::viewport::ViewportConstraints;
-use webrender_api::{self, DeviceIntPoint, DeviceIntSize};
+use webrender_api;
+use webrender_api::units::{DeviceIntPoint, DeviceIntSize};
 use webvr_traits::WebVRMainThreadHeartbeat;
 
 /// Sends messages to the compositor.

components/compositing/windowing.rs

@@ -19,10 +19,9 @@ use std::fmt::{Debug, Error, Formatter};
 use std::rc::Rc;
 use std::time::Duration;
 use style_traits::DevicePixel;
-use webrender_api::{
+use webrender_api::units::DevicePoint;
-    DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePoint, FramebufferIntRect,
+use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize};
-    FramebufferIntSize, ScrollLocation,
+use webrender_api::ScrollLocation;
-};
 use webvr::VRServiceManager;
 use webvr_traits::WebVRMainThreadHeartbeat;
 
@@ -192,16 +191,16 @@ pub struct EmbedderCoordinates {
     /// Size of the native window.
     pub window: (DeviceIntSize, DeviceIntPoint),
     /// Size of the GL buffer in the window.
-    pub framebuffer: FramebufferIntSize,
+    pub framebuffer: DeviceIntSize,
     /// Coordinates of the document within the framebuffer.
     pub viewport: DeviceIntRect,
 }
 
 impl EmbedderCoordinates {
-    pub fn get_flipped_viewport(&self) -> FramebufferIntRect {
+    pub fn get_flipped_viewport(&self) -> DeviceIntRect {
         let fb_height = self.framebuffer.height;
         let mut view = self.viewport.clone();
         view.origin.y = fb_height - view.origin.y - view.size.height;
-        FramebufferIntRect::from_untyped(&view.to_untyped())
+        DeviceIntRect::from_untyped(&view.to_untyped())
     }
 }

components/embedder_traits/lib.rs

@@ -19,7 +19,7 @@ use keyboard_types::KeyboardEvent;
 use msg::constellation_msg::{InputMethodType, PipelineId, TopLevelBrowsingContextId};
 use servo_url::ServoUrl;
 use std::fmt::{Debug, Error, Formatter};
-use webrender_api::{DeviceIntPoint, DeviceIntSize};
+use webrender_api::units::{DeviceIntPoint, DeviceIntSize};
 
 /// A cursor for the window. This is different from a CSS cursor (see
 /// `CursorKind`) in that it has no `Auto` value.

components/geometry/lib.rs

@@ -8,7 +8,7 @@ extern crate malloc_size_of_derive;
 use app_units::{Au, MAX_AU, MIN_AU};
 use euclid::{Length, Point2D, Rect, Size2D};
 use std::f32;
-use webrender_api::{FramebufferPixel, LayoutPoint, LayoutRect, LayoutSize};
+use webrender_api::units::{FramebufferPixel, LayoutPoint, LayoutRect, LayoutSize};
 
 // Units for use with euclid::length and euclid::scale_factor.
 

components/gfx/Cargo.toml

@@ -60,5 +60,5 @@ servo-fontconfig = "0.4"
 xml5ever = {version = "0.14"}
 
 [target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.8"
+dwrote = "0.9"
 truetype = "0.26"

components/layout/display_list/border.rs

@@ -12,8 +12,8 @@ use style::values::computed::{BorderCornerRadius, BorderImageWidth};
 use style::values::computed::{BorderImageSideWidth, NonNegativeLengthOrNumber};
 use style::values::generics::rect::Rect as StyleRect;
 use style::values::generics::NonNegative;
-use webrender_api::{BorderRadius, BorderSide, BorderStyle, ColorF};
+use webrender_api::units::{LayoutSideOffsets, LayoutSize};
-use webrender_api::{LayoutSideOffsets, LayoutSize, NormalBorder};
+use webrender_api::{BorderRadius, BorderSide, BorderStyle, ColorF, NormalBorder};
 
 /// Computes a border radius size against the containing size.
 ///

components/layout/display_list/builder.rs

@@ -13,7 +13,7 @@ use crate::context::LayoutContext;
 use crate::display_list::background::{self, get_cyclic};
 use crate::display_list::border;
 use crate::display_list::gradient;
-use crate::display_list::items::{BaseDisplayItem, ClipScrollNode, BLUR_INFLATION_FACTOR};
+use crate::display_list::items::{self, BaseDisplayItem, ClipScrollNode};
 use crate::display_list::items::{ClipScrollNodeIndex, ClipScrollNodeType, ClippingAndScrolling};
 use crate::display_list::items::{ClippingRegion, DisplayItem, DisplayItemMetadata, DisplayList};
 use crate::display_list::items::{CommonDisplayItem, DisplayListSection};
@@ -32,7 +32,7 @@ use crate::table_cell::CollapsedBordersForCell;
 use app_units::{Au, AU_PER_PX};
 use canvas_traits::canvas::{CanvasMsg, FromLayoutMsg};
 use embedder_traits::Cursor;
-use euclid::{rect, Point2D, Rect, SideOffsets2D, Size2D, TypedRect, TypedSize2D, Vector2D};
+use euclid::{rect, Point2D, Rect, SideOffsets2D, Size2D, TypedRect, TypedSize2D};
 use fnv::FnvHashMap;
 use gfx::text::glyph::ByteIndex;
 use gfx::text::TextRun;
@@ -43,7 +43,7 @@ use net_traits::image_cache::UsePlaceholder;
 use range::Range;
 use script_traits::IFrameSize;
 use servo_config::opts;
-use servo_geometry::MaxRect;
+use servo_geometry::{self, MaxRect};
 use std::default::Default;
 use std::f32;
 use std::mem;
@@ -64,12 +64,11 @@ use style::values::generics::image::{GradientKind, PaintWorklet};
 use style::values::specified::ui::CursorKind;
 use style::values::{Either, RGBA};
 use style_traits::ToCss;
-use webrender_api::{
+use webrender_api::units::{LayoutRect, LayoutSize, LayoutTransform, LayoutVector2D};
-    self, BorderDetails, BorderRadius, BorderSide, BoxShadowClipMode, ColorF, ColorU,
+use webrender_api::{self, BorderDetails, BorderRadius, BorderSide, BoxShadowClipMode, ColorF};
-    ExternalScrollId, FilterOp, GlyphInstance, ImageRendering, LayoutRect, LayoutSize,
+use webrender_api::{ColorU, ExternalScrollId, FilterOp, GlyphInstance, ImageRendering, LineStyle};
-    LayoutTransform, LayoutVector2D, LineStyle, NinePatchBorder, NinePatchBorderSource,
+use webrender_api::{NinePatchBorder, NinePatchBorderSource, NormalBorder};
-    NormalBorder, ScrollSensitivity, StickyOffsetBounds,
+use webrender_api::{ScrollSensitivity, StickyOffsetBounds};
-};
 
 static THREAD_TINT_COLORS: [ColorF; 8] = [
     ColorF {
@@ -346,7 +345,7 @@ impl<'a> DisplayListBuildState<'a> {
         }
     }
 
-    fn add_display_item(&mut self, display_item: DisplayItem) {
+    pub fn add_display_item(&mut self, display_item: DisplayItem) {
         let items = self
             .items
             .entry(display_item.stacking_context_id())
@@ -375,9 +374,8 @@ impl<'a> DisplayListBuildState<'a> {
             self.processing_scrolling_overflow_element
     }
 
-    fn create_base_display_item(
+    pub fn create_base_display_item(
         &self,
-        bounds: Rect<Au>,
         clip_rect: Rect<Au>,
         node: OpaqueNode,
         cursor: Option<Cursor>,
@@ -391,7 +389,6 @@ impl<'a> DisplayListBuildState<'a> {
             self.current_clipping_and_scrolling
         };
         self.create_base_display_item_with_clipping_and_scrolling(
-            bounds,
             clip_rect,
             node,
             cursor,
@@ -402,7 +399,6 @@ impl<'a> DisplayListBuildState<'a> {
 
     fn create_base_display_item_with_clipping_and_scrolling(
         &self,
-        bounds: Rect<Au>,
         clip_rect: Rect<Au>,
         node: OpaqueNode,
         cursor: Option<Cursor>,
@@ -410,7 +406,6 @@ impl<'a> DisplayListBuildState<'a> {
         clipping_and_scrolling: ClippingAndScrolling,
     ) -> BaseDisplayItem {
         BaseDisplayItem::new(
-            bounds.to_layout(),
             DisplayItemMetadata {
                 node,
                 // Store cursor id in display list.
@@ -707,7 +702,6 @@ impl Fragment {
             }
 
             let base = state.create_base_display_item(
-                bounds,
                 bounds,
                 self.node,
                 get_cursor(&style, Cursor::Default),
@@ -717,6 +711,7 @@ impl Fragment {
                 base,
                 webrender_api::RectangleDisplayItem {
                     color: background_color.to_layout(),
+                    common: items::empty_common_item_properties(),
                 },
             )));
         });
@@ -844,7 +839,6 @@ impl Fragment {
 
             // Create the image display item.
             let base = state.create_base_display_item(
-                placement.bounds,
                 placement.clip_rect,
                 self.node,
                 get_cursor(&style, Cursor::Default),
@@ -855,6 +849,8 @@ impl Fragment {
             state.add_image_item(
                 base,
                 webrender_api::ImageDisplayItem {
+                    bounds: placement.bounds.to_f32_px(),
+                    common: items::empty_common_item_properties(),
                     image_key: webrender_image.key.unwrap(),
                     stretch_size: placement.tile_size.to_layout(),
                     tile_spacing: placement.tile_spacing.to_layout(),
@@ -959,7 +955,6 @@ impl Fragment {
             }
 
             let base = state.create_base_display_item(
-                placement.bounds,
                 placement.clip_rect,
                 self.node,
                 get_cursor(&style, Cursor::Default),
@@ -977,6 +972,8 @@ impl Fragment {
                     );
                     let item = webrender_api::GradientDisplayItem {
                         gradient,
+                        bounds: placement.bounds.to_f32_px(),
+                        common: items::empty_common_item_properties(),
                         tile_size: placement.tile_size.to_layout(),
                         tile_spacing: placement.tile_spacing.to_layout(),
                     };
@@ -993,6 +990,8 @@ impl Fragment {
                     );
                     let item = webrender_api::RadialGradientDisplayItem {
                         gradient,
+                        bounds: placement.bounds.to_f32_px(),
+                        common: items::empty_common_item_properties(),
                         tile_size: placement.tile_size.to_layout(),
                         tile_spacing: placement.tile_spacing.to_layout(),
                     };
@@ -1015,17 +1014,7 @@ impl Fragment {
     ) {
         // NB: According to CSS-BACKGROUNDS, box shadows render in *reverse* order (front to back).
         for box_shadow in style.get_effects().box_shadow.0.iter().rev() {
-            let bounds = shadow_bounds(
-                absolute_bounds.translate(&Vector2D::new(
-                    Au::from(box_shadow.base.horizontal),
-                    Au::from(box_shadow.base.vertical),
-                )),
-                Au::from(box_shadow.base.blur),
-                Au::from(box_shadow.spread),
-            );
-
             let base = state.create_base_display_item(
-                bounds,
                 clip,
                 self.node,
                 get_cursor(&style, Cursor::Default),
@@ -1035,6 +1024,7 @@ impl Fragment {
             state.add_display_item(DisplayItem::BoxShadow(CommonDisplayItem::new(
                 base,
                 webrender_api::BoxShadowDisplayItem {
+                    common: items::empty_common_item_properties(),
                     box_bounds: absolute_bounds.to_layout(),
                     color: style.resolve_color(box_shadow.base.color).to_layout(),
                     offset: LayoutVector2D::new(
@@ -1109,7 +1099,6 @@ impl Fragment {
 
         // Append the border to the display list.
         let base = state.create_base_display_item(
-            bounds,
             clip,
             self.node,
             get_cursor(&style, Cursor::Default),
@@ -1161,6 +1150,8 @@ impl Fragment {
         state.add_display_item(DisplayItem::Border(CommonDisplayItem::with_data(
             base,
             webrender_api::BorderDisplayItem {
+                bounds: bounds.to_layout(),
+                common: items::empty_common_item_properties(),
                 widths: border_widths.to_layout(),
                 details,
             },
@@ -1265,6 +1256,8 @@ impl Fragment {
         state.add_display_item(DisplayItem::Border(CommonDisplayItem::with_data(
             base,
             webrender_api::BorderDisplayItem {
+                bounds: bounds.to_layout(),
+                common: items::empty_common_item_properties(),
                 widths: border_image_width,
                 details,
             },
@@ -1308,7 +1301,6 @@ impl Fragment {
             .resolve_color(style.get_outline().outline_color)
             .to_layout();
         let base = state.create_base_display_item(
-            bounds,
             clip,
             self.node,
             get_cursor(&style, Cursor::Default),
@@ -1317,6 +1309,8 @@ impl Fragment {
         state.add_display_item(DisplayItem::Border(CommonDisplayItem::with_data(
             base,
             webrender_api::BorderDisplayItem {
+                bounds: bounds.to_layout(),
+                common: items::empty_common_item_properties(),
                 widths: SideOffsets2D::new_all_same(width).to_layout(),
                 details: BorderDetails::Normal(border::simple(color, outline_style.to_layout())),
             },
@@ -1339,7 +1333,6 @@ impl Fragment {
 
         // Compute the text fragment bounds and draw a border surrounding them.
         let base = state.create_base_display_item(
-            stacking_relative_border_box,
             clip,
             self.node,
             get_cursor(&style, Cursor::Default),
@@ -1348,6 +1341,8 @@ impl Fragment {
         state.add_display_item(DisplayItem::Border(CommonDisplayItem::with_data(
             base,
             webrender_api::BorderDisplayItem {
+                bounds: stacking_relative_border_box.to_layout(),
+                common: items::empty_common_item_properties(),
                 widths: SideOffsets2D::new_all_same(Au::from_px(1)).to_layout(),
                 details: BorderDetails::Normal(border::simple(
                     ColorU::new(0, 0, 200, 1).into(),
@@ -1368,17 +1363,19 @@ impl Fragment {
         let baseline = baseline.to_physical(self.style.writing_mode, container_size);
 
         let base = state.create_base_display_item(
-            baseline,
             clip,
             self.node,
             get_cursor(&style, Cursor::Default),
             DisplayListSection::Content,
         );
         // TODO(gw): Use a better estimate for wavy line thickness.
-        let wavy_line_thickness = (0.33 * base.bounds.size.height).ceil();
+        let area = baseline.to_layout();
+        let wavy_line_thickness = (0.33 * area.size.height).ceil();
         state.add_display_item(DisplayItem::Line(CommonDisplayItem::new(
             base,
             webrender_api::LineDisplayItem {
+                common: items::empty_common_item_properties(),
+                area,
                 orientation: webrender_api::LineOrientation::Horizontal,
                 wavy_line_thickness,
                 color: ColorU::new(0, 200, 0, 1).into(),
@@ -1396,7 +1393,6 @@ impl Fragment {
     ) {
         // This prints a debug border around the border of this fragment.
         let base = state.create_base_display_item(
-            stacking_relative_border_box,
             clip,
             self.node,
             get_cursor(&self.style, Cursor::Default),
@@ -1405,6 +1401,8 @@ impl Fragment {
         state.add_display_item(DisplayItem::Border(CommonDisplayItem::with_data(
             base,
             webrender_api::BorderDisplayItem {
+                bounds: stacking_relative_border_box.to_layout(),
+                common: items::empty_common_item_properties(),
                 widths: SideOffsets2D::new_all_same(Au::from_px(1)).to_layout(),
                 details: BorderDetails::Normal(border::simple(
                     ColorU::new(0, 0, 200, 1).into(),
@@ -1422,7 +1420,6 @@ impl Fragment {
         state: &mut DisplayListBuildState,
         stacking_relative_border_box: Rect<Au>,
         display_list_section: DisplayListSection,
-        clip: Rect<Au>,
     ) {
         let scanned_text_fragment_info = match self.specific {
             SpecificFragmentInfo::ScannedText(ref scanned_text_fragment_info) => {
@@ -1439,7 +1436,6 @@ impl Fragment {
             let background_color = style.resolve_color(style.get_background().background_color);
             let base = state.create_base_display_item(
                 stacking_relative_border_box,
-                clip,
                 self.node,
                 get_cursor(&self.style, Cursor::Default),
                 display_list_section,
@@ -1447,6 +1443,7 @@ impl Fragment {
             state.add_display_item(DisplayItem::Rectangle(CommonDisplayItem::new(
                 base,
                 webrender_api::RectangleDisplayItem {
+                    common: items::empty_common_item_properties(),
                     color: background_color.to_layout(),
                 },
             )));
@@ -1485,7 +1482,6 @@ impl Fragment {
 
         let base = state.create_base_display_item(
             insertion_point_bounds,
-            clip,
             self.node,
             get_cursor(&self.style, cursor),
             display_list_section,
@@ -1493,6 +1489,7 @@ impl Fragment {
         state.add_display_item(DisplayItem::Rectangle(CommonDisplayItem::new(
             base,
             webrender_api::RectangleDisplayItem {
+                common: items::empty_common_item_properties(),
                 color: self.style().get_inherited_text().color.to_layout(),
             },
         )));
@@ -1649,7 +1646,6 @@ impl Fragment {
                 state,
                 stacking_relative_border_box,
                 display_list_section,
-                clip,
             );
         }
 
@@ -1666,7 +1662,6 @@ impl Fragment {
             // scrollable ancestor.
             let content_size = TypedRect::new(stacking_relative_border_box.origin, content_size);
             let base = state.create_base_display_item_with_clipping_and_scrolling(
-                content_size,
                 content_size,
                 self.node,
                 // FIXME(emilio): Why does this ignore pointer-events?
@@ -1677,6 +1672,7 @@ impl Fragment {
             state.add_display_item(DisplayItem::Rectangle(CommonDisplayItem::new(
                 base,
                 webrender_api::RectangleDisplayItem {
+                    common: items::empty_common_item_properties(),
                     color: ColorF::TRANSPARENT,
                 },
             )));
@@ -1719,7 +1715,6 @@ impl Fragment {
             }
 
             state.create_base_display_item(
-                stacking_relative_content_box,
                 stacking_relative_border_box,
                 self.node,
                 get_cursor(&self.style, Cursor::Default),
@@ -1806,12 +1801,16 @@ impl Fragment {
                     };
 
                     let base = create_base_display_item(state);
+                    let bounds = stacking_relative_content_box.to_layout();
                     let item = DisplayItem::Iframe(Box::new(IframeDisplayItem {
                         base,
+                        bounds,
                         iframe: pipeline_id,
                     }));
 
-                    let size = Size2D::new(item.bounds().size.width, item.bounds().size.height);
+                    // XXXjdm: This sleight-of-hand to convert LayoutRect -> Size2D<CSSPixel>
+                    //         looks bogus.
+                    let size = Size2D::new(bounds.size.width, bounds.size.height);
                     state.iframe_sizes.push(IFrameSize {
                         id: browsing_context_id,
                         size: TypedSize2D::from_untyped(&size),
@@ -1828,6 +1827,8 @@ impl Fragment {
                         state.add_image_item(
                             base,
                             webrender_api::ImageDisplayItem {
+                                bounds: stacking_relative_content_box.to_layout(),
+                                common: items::empty_common_item_properties(),
                                 image_key: id,
                                 stretch_size: stacking_relative_content_box.size.to_layout(),
                                 tile_spacing: LayoutSize::zero(),
@@ -1849,6 +1850,8 @@ impl Fragment {
                     state.add_image_item(
                         base,
                         webrender_api::ImageDisplayItem {
+                            bounds: stacking_relative_content_box.to_layout(),
+                            common: items::empty_common_item_properties(),
                             image_key: *image_key,
                             stretch_size: stacking_relative_border_box.size.to_layout(),
                             tile_spacing: LayoutSize::zero(),
@@ -1880,6 +1883,8 @@ impl Fragment {
 
                 let base = create_base_display_item(state);
                 let display_item = webrender_api::ImageDisplayItem {
+                    bounds: stacking_relative_border_box.to_layout(),
+                    common: items::empty_common_item_properties(),
                     image_key,
                     stretch_size: stacking_relative_content_box.size.to_layout(),
                     tile_spacing: LayoutSize::zero(),
@@ -1997,7 +2002,6 @@ impl Fragment {
 
         // Base item for all text/shadows
         let base = state.create_base_display_item(
-            stacking_relative_content_box,
             clip,
             self.node,
             get_cursor(&self.style, cursor),
@@ -2016,7 +2020,6 @@ impl Fragment {
                         offset: LayoutVector2D::new(shadow.horizontal.px(), shadow.vertical.px()),
                         color: self.style.resolve_color(shadow.color).to_layout(),
                         blur_radius: shadow.blur.px(),
-                        should_inflate: true,
                     },
                 },
             )));
@@ -2076,6 +2079,8 @@ impl Fragment {
             state.add_display_item(DisplayItem::Text(CommonDisplayItem::with_data(
                 base.clone(),
                 webrender_api::TextDisplayItem {
+                    bounds: stacking_relative_content_box.to_layout(),
+                    common: items::empty_common_item_properties(),
                     font_key: text_fragment.run.font_key,
                     color: text_color.to_layout(),
                     glyph_options: None,
@@ -2122,7 +2127,6 @@ impl Fragment {
         let stacking_relative_box =
             stacking_relative_box.to_physical(self.style.writing_mode, container_size);
         let base = state.create_base_display_item(
-            stacking_relative_box,
             clip,
             self.node,
             get_cursor(&self.style, Cursor::Default),
@@ -2130,10 +2134,13 @@ impl Fragment {
         );
 
         // TODO(gw): Use a better estimate for wavy line thickness.
-        let wavy_line_thickness = (0.33 * base.bounds.size.height).ceil();
+        let area = stacking_relative_box.to_layout();
+        let wavy_line_thickness = (0.33 * area.size.height).ceil();
         state.add_display_item(DisplayItem::Line(CommonDisplayItem::new(
             base,
             webrender_api::LineDisplayItem {
+                common: items::empty_common_item_properties(),
+                area,
                 orientation: webrender_api::LineOrientation::Horizontal,
                 wavy_line_thickness,
                 color: color.to_layout(),
@@ -2837,16 +2844,14 @@ impl BaseFlow {
 
         let mut color = THREAD_TINT_COLORS[thread_id as usize % THREAD_TINT_COLORS.len()];
         color.a = 1.0;
-        let base = state.create_base_display_item(
+        let base =
-            stacking_context_relative_bounds.inflate(Au::from_px(2), Au::from_px(2)),
+            state.create_base_display_item(self.clip, node, None, DisplayListSection::Content);
-            self.clip,
+        let bounds = stacking_context_relative_bounds.inflate(Au::from_px(2), Au::from_px(2));
-            node,
-            None,
-            DisplayListSection::Content,
-        );
         state.add_display_item(DisplayItem::Border(CommonDisplayItem::with_data(
             base,
             webrender_api::BorderDisplayItem {
+                bounds: bounds.to_layout(),
+                common: items::empty_common_item_properties(),
                 widths: SideOffsets2D::new_all_same(Au::from_px(2)).to_layout(),
                 details: BorderDetails::Normal(border::simple(
                     color,
@@ -2908,13 +2913,6 @@ fn get_cursor(values: &ComputedValues, default_cursor: Cursor) -> Option<Cursor>
     })
 }
 
-/// Adjusts `content_rect` as necessary for the given spread, and blur so that the resulting
-/// bounding rect contains all of a shadow's ink.
-fn shadow_bounds(content_rect: Rect<Au>, blur: Au, spread: Au) -> Rect<Au> {
-    let inflation = spread + blur * BLUR_INFLATION_FACTOR;
-    content_rect.inflate(inflation, inflation)
-}
-
 /// Adjusts borders as appropriate to account for a fragment's status as the
 /// first or last fragment within the range of an element.
 ///
@@ -3012,3 +3010,15 @@ impl IndexableText {
         )
     }
 }
+
+trait ToF32Px {
+    type Output;
+    fn to_f32_px(&self) -> Self::Output;
+}
+
+impl ToF32Px for TypedRect<Au> {
+    type Output = LayoutRect;
+    fn to_f32_px(&self) -> LayoutRect {
+        LayoutRect::from_untyped(&servo_geometry::au_rect_to_f32_rect(*self))
+    }
+}

components/layout/display_list/conversions.rs

@@ -114,23 +114,23 @@ impl ToLayout for RGBA {
 }
 
 impl ToLayout for Point2D<Au> {
-    type Type = wr::LayoutPoint;
+    type Type = wr::units::LayoutPoint;
     fn to_layout(&self) -> Self::Type {
-        wr::LayoutPoint::new(self.x.to_f32_px(), self.y.to_f32_px())
+        wr::units::LayoutPoint::new(self.x.to_f32_px(), self.y.to_f32_px())
     }
 }
 
 impl ToLayout for Rect<Au> {
-    type Type = wr::LayoutRect;
+    type Type = wr::units::LayoutRect;
     fn to_layout(&self) -> Self::Type {
-        wr::LayoutRect::new(self.origin.to_layout(), self.size.to_layout())
+        wr::units::LayoutRect::new(self.origin.to_layout(), self.size.to_layout())
     }
 }
 
 impl ToLayout for SideOffsets2D<Au> {
-    type Type = wr::LayoutSideOffsets;
+    type Type = wr::units::LayoutSideOffsets;
     fn to_layout(&self) -> Self::Type {
-        wr::LayoutSideOffsets::new(
+        wr::units::LayoutSideOffsets::new(
             self.top.to_f32_px(),
             self.right.to_f32_px(),
             self.bottom.to_f32_px(),
@@ -140,16 +140,16 @@ impl ToLayout for SideOffsets2D<Au> {
 }
 
 impl ToLayout for Size2D<Au> {
-    type Type = wr::LayoutSize;
+    type Type = wr::units::LayoutSize;
     fn to_layout(&self) -> Self::Type {
-        wr::LayoutSize::new(self.width.to_f32_px(), self.height.to_f32_px())
+        wr::units::LayoutSize::new(self.width.to_f32_px(), self.height.to_f32_px())
     }
 }
 
 impl ToLayout for Vector2D<Au> {
-    type Type = wr::LayoutVector2D;
+    type Type = wr::units::LayoutVector2D;
     fn to_layout(&self) -> Self::Type {
-        wr::LayoutVector2D::new(self.x.to_f32_px(), self.y.to_f32_px())
+        wr::units::LayoutVector2D::new(self.x.to_f32_px(), self.y.to_f32_px())
     }
 }
 

components/layout/display_list/items.rs

@@ -12,7 +12,7 @@
 //! They are therefore not exactly analogous to constructs like Skia pictures, which consist of
 //! low-level drawing primitives.
 
-use euclid::{SideOffsets2D, TypedRect, Vector2D};
+use euclid::{SideOffsets2D, Vector2D};
 use gfx_traits::print_tree::PrintTree;
 use gfx_traits::{self, StackingContextId};
 use msg::constellation_msg::PipelineId;
@@ -24,11 +24,10 @@ use std::f32;
 use std::fmt;
 use style::computed_values::_servo_top_layer::T as InTopLayer;
 use webrender_api as wr;
-use webrender_api::{BorderRadius, ClipMode};
+use webrender_api::units::{LayoutPoint, LayoutRect, LayoutSize, LayoutTransform};
-use webrender_api::{ComplexClipRegion, ExternalScrollId, FilterOp};
+use webrender_api::{BorderRadius, ClipId, ClipMode, CommonItemProperties, ComplexClipRegion};
-use webrender_api::{GlyphInstance, GradientStop, ImageKey, LayoutPoint};
+use webrender_api::{ExternalScrollId, FilterOp, GlyphInstance, GradientStop, ImageKey};
-use webrender_api::{LayoutRect, LayoutSize, LayoutTransform};
+use webrender_api::{MixBlendMode, ScrollSensitivity, Shadow, SpatialId};
-use webrender_api::{MixBlendMode, ScrollSensitivity, Shadow};
 use webrender_api::{StickyOffsetBounds, TransformStyle};
 
 pub use style::dom::OpaqueNode;
@@ -410,9 +409,6 @@ pub enum DisplayItem {
 /// Information common to all display items.
 #[derive(Clone, Serialize)]
 pub struct BaseDisplayItem {
-    /// The boundaries of the display item, in layer coordinates.
-    pub bounds: LayoutRect,
-
     /// Metadata attached to this display item.
     pub metadata: DisplayItemMetadata,
 
@@ -432,7 +428,6 @@ pub struct BaseDisplayItem {
 impl BaseDisplayItem {
     #[inline(always)]
     pub fn new(
-        bounds: LayoutRect,
         metadata: DisplayItemMetadata,
         clip_rect: LayoutRect,
         section: DisplayListSection,
@@ -440,7 +435,6 @@ impl BaseDisplayItem {
         clipping_and_scrolling: ClippingAndScrolling,
     ) -> BaseDisplayItem {
         BaseDisplayItem {
-            bounds,
             metadata,
             clip_rect,
             section,
@@ -452,7 +446,6 @@ impl BaseDisplayItem {
     #[inline(always)]
     pub fn empty() -> BaseDisplayItem {
         BaseDisplayItem {
-            bounds: TypedRect::zero(),
             metadata: DisplayItemMetadata {
                 node: OpaqueNode(0),
                 pointing: None,
@@ -468,6 +461,16 @@ impl BaseDisplayItem {
     }
 }
 
+pub fn empty_common_item_properties() -> CommonItemProperties {
+    CommonItemProperties {
+        clip_rect: LayoutRect::max_rect(),
+        clip_id: ClipId::root(wr::PipelineId::dummy()),
+        spatial_id: SpatialId::root_scroll_node(wr::PipelineId::dummy()),
+        hit_info: None,
+        is_backface_visible: false,
+    }
+}
+
 /// A clipping region for a display item. Currently, this can describe rectangles, rounded
 /// rectangles (for `border-radius`), or arbitrary intersections of the two. Arbitrary transforms
 /// are not supported because those are handled by the higher-level `StackingContext` abstraction.
@@ -609,6 +612,7 @@ pub enum TextOrientation {
 pub struct IframeDisplayItem {
     pub base: BaseDisplayItem,
     pub iframe: PipelineId,
+    pub bounds: LayoutRect,
 }
 
 #[derive(Clone, Serialize)]
@@ -711,7 +715,22 @@ impl DisplayItem {
     }
 
     pub fn bounds(&self) -> LayoutRect {
-        self.base().bounds
+        match *self {
+            DisplayItem::Rectangle(ref item) => item.item.common.clip_rect,
+            DisplayItem::Text(ref item) => item.item.bounds,
+            DisplayItem::Image(ref item) => item.item.bounds,
+            DisplayItem::Border(ref item) => item.item.bounds,
+            DisplayItem::Gradient(ref item) => item.item.bounds,
+            DisplayItem::RadialGradient(ref item) => item.item.bounds,
+            DisplayItem::Line(ref item) => item.item.area,
+            DisplayItem::BoxShadow(ref item) => item.item.box_bounds,
+            DisplayItem::PushTextShadow(_) => LayoutRect::zero(),
+            DisplayItem::PopAllTextShadows(_) => LayoutRect::zero(),
+            DisplayItem::Iframe(ref item) => item.bounds,
+            DisplayItem::PushStackingContext(ref item) => item.stacking_context.bounds,
+            DisplayItem::PopStackingContext(_) => LayoutRect::zero(),
+            DisplayItem::DefineClipScrollNode(_) => LayoutRect::zero(),
+        }
     }
 }
 

components/layout/display_list/webrender_helpers.rs

@@ -7,16 +7,18 @@
 //           This might be achieved by sharing types between WR and Servo display lists, or
 //           completely converting layout to directly generate WebRender display lists, for example.
 
-use crate::display_list::items::{ClipScrollNode, ClipScrollNodeType};
+use crate::display_list::items::{BaseDisplayItem, ClipScrollNode, ClipScrollNodeType};
 use crate::display_list::items::{DisplayItem, DisplayList, StackingContextType};
 use msg::constellation_msg::PipelineId;
+use webrender_api::units::LayoutPoint;
+use webrender_api::{self, ClipId, CommonItemProperties, DisplayItem as WrDisplayItem};
+use webrender_api::{DisplayListBuilder, PropertyBinding, PushStackingContextDisplayItem};
 use webrender_api::{
-    self, ClipId, DisplayListBuilder, RasterSpace, ReferenceFrameKind, SpaceAndClipInfo, SpatialId,
+    RasterSpace, ReferenceFrameKind, SpaceAndClipInfo, SpatialId, StackingContext,
 };
-use webrender_api::{LayoutPoint, PropertyBinding, SpecificDisplayItem};
 
 pub trait WebRenderDisplayListConverter {
-    fn convert_to_webrender(&self, pipeline_id: PipelineId) -> DisplayListBuilder;
+    fn convert_to_webrender(&mut self, pipeline_id: PipelineId) -> DisplayListBuilder;
 }
 
 struct ClipScrollState {
@@ -27,9 +29,8 @@ struct ClipScrollState {
 }
 
 trait WebRenderDisplayItemConverter {
-    fn prim_info(&self) -> webrender_api::LayoutPrimitiveInfo;
     fn convert_to_webrender(
-        &self,
+        &mut self,
         clip_scroll_nodes: &[ClipScrollNode],
         state: &mut ClipScrollState,
         builder: &mut DisplayListBuilder,
@@ -37,7 +38,7 @@ trait WebRenderDisplayItemConverter {
 }
 
 impl WebRenderDisplayListConverter for DisplayList {
-    fn convert_to_webrender(&self, pipeline_id: PipelineId) -> DisplayListBuilder {
+    fn convert_to_webrender(&mut self, pipeline_id: PipelineId) -> DisplayListBuilder {
         let mut clip_ids = vec![None; self.clip_scroll_nodes.len()];
         let mut spatial_ids = vec![None; self.clip_scroll_nodes.len()];
 
@@ -66,7 +67,7 @@ impl WebRenderDisplayListConverter for DisplayList {
             1024 * 1024, // 1 MB of space
         );
 
-        for item in &self.list {
+        for item in &mut self.list {
             item.convert_to_webrender(&self.clip_scroll_nodes, &mut state, &mut builder);
         }
 
@@ -75,22 +76,8 @@ impl WebRenderDisplayListConverter for DisplayList {
 }
 
 impl WebRenderDisplayItemConverter for DisplayItem {
-    fn prim_info(&self) -> webrender_api::LayoutPrimitiveInfo {
-        let tag = match self.base().metadata.pointing {
-            Some(cursor) => Some((self.base().metadata.node.0 as u64, cursor)),
-            None => None,
-        };
-        webrender_api::LayoutPrimitiveInfo {
-            rect: self.base().bounds,
-            clip_rect: self.base().clip_rect,
-            // TODO(gw): Make use of the WR backface visibility functionality.
-            is_backface_visible: true,
-            tag,
-        }
-    }
-
     fn convert_to_webrender(
-        &self,
+        &mut self,
         clip_scroll_nodes: &[ClipScrollNode],
         state: &mut ClipScrollState,
         builder: &mut DisplayListBuilder,
@@ -118,92 +105,78 @@ impl WebRenderDisplayItemConverter for DisplayItem {
             state.active_clip_id = cur_clip_id;
         }
 
-        let space_clip_info = SpaceAndClipInfo {
-            spatial_id: state.active_spatial_id,
-            clip_id: state.active_clip_id,
-        };
         match *self {
-            DisplayItem::Rectangle(ref item) => {
+            DisplayItem::Rectangle(ref mut item) => {
-                builder.push_item(
+                item.item.common = build_common_item_properties(&item.base, state);
-                    &SpecificDisplayItem::Rectangle(item.item),
+                builder.push_item(&WrDisplayItem::Rectangle(item.item));
-                    &self.prim_info(),
-                    &space_clip_info,
-                );
             },
-            DisplayItem::Text(ref item) => {
+            DisplayItem::Text(ref mut item) => {
-                builder.push_item(
+                item.item.common = build_common_item_properties(&item.base, state);
-                    &SpecificDisplayItem::Text(item.item),
+                builder.push_item(&WrDisplayItem::Text(item.item));
-                    &self.prim_info(),
-                    &space_clip_info,
-                );
                 builder.push_iter(item.data.iter());
             },
-            DisplayItem::Image(ref item) => {
+            DisplayItem::Image(ref mut item) => {
-                builder.push_item(
+                item.item.common = build_common_item_properties(&item.base, state);
-                    &SpecificDisplayItem::Image(item.item),
+                builder.push_item(&WrDisplayItem::Image(item.item));
-                    &self.prim_info(),
-                    &space_clip_info,
-                );
             },
-            DisplayItem::Border(ref item) => {
+            DisplayItem::Border(ref mut item) => {
+                item.item.common = build_common_item_properties(&item.base, state);
                 if !item.data.is_empty() {
                     builder.push_stops(item.data.as_ref());
                 }
-                builder.push_item(
+                builder.push_item(&WrDisplayItem::Border(item.item));
-                    &SpecificDisplayItem::Border(item.item),
-                    &self.prim_info(),
-                    &space_clip_info,
-                );
             },
-            DisplayItem::Gradient(ref item) => {
+            DisplayItem::Gradient(ref mut item) => {
+                item.item.common = build_common_item_properties(&item.base, state);
                 builder.push_stops(item.data.as_ref());
-                builder.push_item(
+                builder.push_item(&WrDisplayItem::Gradient(item.item));
-                    &SpecificDisplayItem::Gradient(item.item),
-                    &self.prim_info(),
-                    &space_clip_info,
-                );
             },
-            DisplayItem::RadialGradient(ref item) => {
+            DisplayItem::RadialGradient(ref mut item) => {
+                item.item.common = build_common_item_properties(&item.base, state);
                 builder.push_stops(item.data.as_ref());
-                builder.push_item(
+                builder.push_item(&WrDisplayItem::RadialGradient(item.item));
-                    &SpecificDisplayItem::RadialGradient(item.item),
-                    &self.prim_info(),
-                    &space_clip_info,
-                );
             },
-            DisplayItem::Line(ref item) => {
+            DisplayItem::Line(ref mut item) => {
-                builder.push_item(
+                item.item.common = build_common_item_properties(&item.base, state);
-                    &SpecificDisplayItem::Line(item.item),
+                builder.push_item(&WrDisplayItem::Line(item.item));
-                    &self.prim_info(),
-                    &space_clip_info,
-                );
             },
-            DisplayItem::BoxShadow(ref item) => {
+            DisplayItem::BoxShadow(ref mut item) => {
-                builder.push_item(
+                item.item.common = build_common_item_properties(&item.base, state);
-                    &SpecificDisplayItem::BoxShadow(item.item),
+                builder.push_item(&WrDisplayItem::BoxShadow(item.item));
-                    &self.prim_info(),
-                    &space_clip_info,
-                );
             },
-            DisplayItem::PushTextShadow(ref item) => {
+            DisplayItem::PushTextShadow(ref mut item) => {
-                builder.push_shadow(&self.prim_info(), &space_clip_info, item.shadow);
+                let common = build_common_item_properties(&item.base, state);
+                builder.push_shadow(
+                    &SpaceAndClipInfo {
+                        spatial_id: common.spatial_id,
+                        clip_id: common.clip_id,
+                    },
+                    item.shadow,
+                    true,
+                );
             },
             DisplayItem::PopAllTextShadows(_) => {
-                builder.pop_all_shadows();
+                builder.push_item(&WrDisplayItem::PopAllShadows);
             },
-            DisplayItem::Iframe(ref item) => {
+            DisplayItem::Iframe(ref mut item) => {
+                let common = build_common_item_properties(&item.base, state);
                 builder.push_iframe(
-                    &self.prim_info(),
+                    item.bounds,
-                    &space_clip_info,
+                    common.clip_rect,
+                    &SpaceAndClipInfo {
+                        spatial_id: common.spatial_id,
+                        clip_id: common.clip_id,
+                    },
                     item.iframe.to_webrender(),
                     true,
                 );
             },
-            DisplayItem::PushStackingContext(ref item) => {
+            DisplayItem::PushStackingContext(ref mut item) => {
                 let stacking_context = &item.stacking_context;
                 debug_assert_eq!(stacking_context.context_type, StackingContextType::Real);
 
-                let mut info = webrender_api::LayoutPrimitiveInfo::new(stacking_context.bounds);
+                //let mut info = webrender_api::LayoutPrimitiveInfo::new(stacking_context.bounds);
+                let mut bounds = stacking_context.bounds;
                 let spatial_id =
                     if let Some(frame_index) = stacking_context.established_reference_frame {
                         let (transform, ref_frame) =
@@ -225,7 +198,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                             };
 
                         let spatial_id = builder.push_reference_frame(
-                            &stacking_context.bounds,
+                            stacking_context.bounds.origin,
                             state.active_spatial_id,
                             stacking_context.transform_style,
                             PropertyBinding::Value(transform),
@@ -235,27 +208,35 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                         state.spatial_ids[frame_index.to_index()] = Some(spatial_id);
                         state.clip_ids[frame_index.to_index()] = Some(cur_clip_id);
 
-                        info.rect.origin = LayoutPoint::zero();
+                        bounds.origin = LayoutPoint::zero();
-                        info.clip_rect.origin = LayoutPoint::zero();
                         spatial_id
                     } else {
                         state.active_spatial_id
                     };
 
-                builder.push_stacking_context(
+                if !stacking_context.filters.is_empty() {
-                    &info,
+                    builder.push_item(&WrDisplayItem::SetFilterOps);
+                    builder.push_iter(&stacking_context.filters);
+                }
+
+                let wr_item = PushStackingContextDisplayItem {
+                    origin: bounds.origin,
                     spatial_id,
-                    None,
+                    is_backface_visible: true,
-                    stacking_context.transform_style,
+                    stacking_context: StackingContext {
-                    stacking_context.mix_blend_mode,
+                        transform_style: stacking_context.transform_style,
-                    &stacking_context.filters,
+                        mix_blend_mode: stacking_context.mix_blend_mode,
-                    &[],
+                        clip_id: None,
-                    RasterSpace::Screen,
+                        raster_space: RasterSpace::Screen,
-                    /* cache_tiles = */ false,
+                        // TODO(pcwalton): Enable picture caching?
-                );
+                        cache_tiles: false,
+                    },
+                };
+
+                builder.push_item(&WrDisplayItem::PushStackingContext(wr_item));
             },
             DisplayItem::PopStackingContext(_) => builder.pop_stacking_context(),
-            DisplayItem::DefineClipScrollNode(ref item) => {
+            DisplayItem::DefineClipScrollNode(ref mut item) => {
                 let node = &clip_scroll_nodes[item.node_index.to_index()];
                 let item_rect = node.clip.main;
 
@@ -291,7 +272,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                             node.clip.complex.clone(),
                             None,
                             scroll_sensitivity,
-                            webrender_api::LayoutVector2D::zero(),
+                            webrender_api::units::LayoutVector2D::zero(),
                         );
 
                         state.clip_ids[item.node_index.to_index()] = Some(space_clip_info.clip_id);
@@ -306,7 +287,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                             sticky_data.margins,
                             sticky_data.vertical_offset_bounds,
                             sticky_data.horizontal_offset_bounds,
-                            webrender_api::LayoutVector2D::zero(),
+                            webrender_api::units::LayoutVector2D::zero(),
                         );
 
                         state.spatial_ids[item.node_index.to_index()] = Some(id);
@@ -320,3 +301,21 @@ impl WebRenderDisplayItemConverter for DisplayItem {
         }
     }
 }
+
+fn build_common_item_properties(
+    base: &BaseDisplayItem,
+    state: &ClipScrollState,
+) -> CommonItemProperties {
+    let tag = match base.metadata.pointing {
+        Some(cursor) => Some((base.metadata.node.0 as u64, cursor)),
+        None => None,
+    };
+    CommonItemProperties {
+        clip_rect: base.clip_rect,
+        spatial_id: state.active_spatial_id,
+        clip_id: state.active_clip_id,
+        // TODO(gw): Make use of the WR backface visibility functionality.
+        is_backface_visible: true,
+        hit_info: tag,
+    }
+}

components/layout/flow.rs

@@ -65,7 +65,7 @@ use style::properties::ComputedValues;
 use style::selector_parser::RestyleDamage;
 use style::servo::restyle_damage::ServoRestyleDamage;
 use style::values::computed::LengthPercentageOrAuto;
-use webrender_api::LayoutTransform;
+use webrender_api::units::LayoutTransform;
 
 /// This marker trait indicates that a type is a struct with `#[repr(C)]` whose first field
 /// is of type `BaseFlow` or some type that also implements this trait.

components/layout/fragment.rs

@@ -65,7 +65,8 @@ use style::values::computed::{LengthPercentage, LengthPercentageOrAuto, Size, Ve
 use style::values::generics::box_::{Perspective, VerticalAlignKeyword};
 use style::values::generics::transform;
 use style::Zero;
-use webrender_api::{self, LayoutTransform};
+use webrender_api;
+use webrender_api::units::LayoutTransform;
 
 // From gfxFontConstants.h in Firefox.
 static FONT_SUBSCRIPT_OFFSET_RATIO: f32 = 0.20;

components/layout/query.rs

@@ -51,7 +51,7 @@ pub struct LayoutThreadData {
     pub constellation_chan: IpcSender<ConstellationMsg>,
 
     /// The root stacking context.
-    pub display_list: Option<Arc<DisplayList>>,
+    pub display_list: Option<DisplayList>,
 
     pub indexable_text: IndexableText,
 

components/layout/sequential.rs

@@ -5,6 +5,7 @@
 //! Implements sequential traversals over the DOM and flow trees.
 
 use crate::context::LayoutContext;
+use crate::display_list::items::{self, CommonDisplayItem, DisplayItem, DisplayListSection};
 use crate::display_list::{DisplayListBuildState, StackingContextCollectionState};
 use crate::floats::SpeculatedFloatPlacement;
 use crate::flow::{Flow, FlowFlags, GetBaseFlow, ImmutableFlowUtils};
@@ -14,10 +15,10 @@ use crate::incremental::RelayoutMode;
 use crate::traversal::{AssignBSizes, AssignISizes, BubbleISizes, BuildDisplayList};
 use crate::traversal::{InorderFlowTraversal, PostorderFlowTraversal, PreorderFlowTraversal};
 use app_units::Au;
-use euclid::{Point2D, Vector2D};
+use euclid::{Point2D, Rect, Size2D, Vector2D};
 use servo_config::opts;
 use style::servo::restyle_damage::ServoRestyleDamage;
-use webrender_api::LayoutPoint;
+use webrender_api::units::LayoutPoint;
 
 pub fn resolve_generated_content(root: &mut dyn Flow, layout_context: &LayoutContext) {
     ResolveGeneratedContent::new(&layout_context).traverse(root, 0);
@@ -72,11 +73,30 @@ pub fn reflow(root: &mut dyn Flow, layout_context: &LayoutContext, relayout_mode
 pub fn build_display_list_for_subtree<'a>(
     flow_root: &mut dyn Flow,
     layout_context: &'a LayoutContext,
+    background_color: webrender_api::ColorF,
+    client_size: Size2D<Au>,
 ) -> DisplayListBuildState<'a> {
     let mut state = StackingContextCollectionState::new(layout_context.id);
     flow_root.collect_stacking_contexts(&mut state);
 
-    let state = DisplayListBuildState::new(layout_context, state);
+    let mut state = DisplayListBuildState::new(layout_context, state);
+
+    // Create a base rectangle for the page background based on the root
+    // background color.
+    let base = state.create_base_display_item(
+        Rect::new(Point2D::new(Au::new(0), Au::new(0)), client_size),
+        flow_root.as_block().fragment.node,
+        None,
+        DisplayListSection::BackgroundAndBorders,
+    );
+    state.add_display_item(DisplayItem::Rectangle(CommonDisplayItem::new(
+        base,
+        webrender_api::RectangleDisplayItem {
+            color: background_color,
+            common: items::empty_common_item_properties(),
+        },
+    )));
+
     let mut build_display_list = BuildDisplayList { state: state };
     build_display_list.traverse(flow_root);
     build_display_list.state

components/layout_thread/lib.rs

@@ -833,7 +833,7 @@ impl LayoutThread {
                 let point = Point2D::new(-state.scroll_offset.x, -state.scroll_offset.y);
                 let mut txn = webrender_api::Transaction::new();
                 txn.scroll_node_with_id(
-                    webrender_api::LayoutPoint::from_untyped(&point),
+                    webrender_api::units::LayoutPoint::from_untyped(&point),
                     state.scroll_id,
                     webrender_api::ScrollClamping::ToContentBounds,
                 );
@@ -1138,8 +1138,13 @@ impl LayoutThread {
                     rw_data.display_list.is_none()
                 {
                     if reflow_goal.needs_display_list() {
-                        let mut build_state =
+                        let background_color = get_root_flow_background_color(layout_root);
-                            sequential::build_display_list_for_subtree(layout_root, layout_context);
+                        let mut build_state = sequential::build_display_list_for_subtree(
+                            layout_root,
+                            layout_context,
+                            background_color,
+                            data.page_clip_rect.size,
+                        );
 
                         debug!("Done building display list.");
 
@@ -1203,7 +1208,7 @@ impl LayoutThread {
                             &mut build_state.indexable_text,
                             IndexableText::default(),
                         );
-                        rw_data.display_list = Some(Arc::new(build_state.to_display_list()));
+                        rw_data.display_list = Some(build_state.to_display_list());
                     }
                 }
 
@@ -1220,7 +1225,8 @@ impl LayoutThread {
                 if let Some(document) = document {
                     document.will_paint();
                 }
-                let display_list = (*rw_data.display_list.as_ref().unwrap()).clone();
+
+                let display_list = rw_data.display_list.as_mut().unwrap();
 
                 if self.dump_display_list {
                     display_list.print();
@@ -1232,11 +1238,7 @@ impl LayoutThread {
                 debug!("Layout done!");
 
                 // TODO: Avoid the temporary conversion and build webrender sc/dl directly!
-                let builder = rw_data
+                let builder = display_list.convert_to_webrender(self.id);
-                    .display_list
-                    .as_ref()
-                    .unwrap()
-                    .convert_to_webrender(self.id);
 
                 let viewport_size = Size2D::new(
                     self.viewport_size.width.to_f32_px(),
@@ -1247,7 +1249,7 @@ impl LayoutThread {
                 epoch.next();
                 self.epoch.set(epoch);
 
-                let viewport_size = webrender_api::LayoutSize::from_untyped(&viewport_size);
+                let viewport_size = webrender_api::units::LayoutSize::from_untyped(&viewport_size);
 
                 // Observe notifications about rendered frames if needed right before
                 // sending the display list to WebRender in order to set time related
@@ -1258,7 +1260,7 @@ impl LayoutThread {
                 let mut txn = webrender_api::Transaction::new();
                 txn.set_display_list(
                     webrender_api::Epoch(epoch.0),
-                    Some(get_root_flow_background_color(layout_root)),
+                    None,
                     viewport_size,
                     builder.finalize(),
                     true,
@@ -1669,7 +1671,8 @@ impl LayoutThread {
                     // particular pipeline, so we need to tell WebRender about that.
                     flags.insert(webrender_api::HitTestFlags::POINT_RELATIVE_TO_PIPELINE_VIEWPORT);
 
-                    let client_point = webrender_api::WorldPoint::from_untyped(&client_point);
+                    let client_point =
+                        webrender_api::units::WorldPoint::from_untyped(&client_point);
                     let results = self.webrender_api.hit_test(
                         self.webrender_document,
                         Some(self.id.to_webrender()),

components/net/image_cache.rs

@@ -17,6 +17,7 @@ use std::io;
 use std::mem;
 use std::sync::{Arc, Mutex};
 use std::thread;
+use webrender_api::units::DeviceIntSize;
 
 ///
 /// TODO(gw): Remaining work on image cache:
@@ -72,7 +73,7 @@ fn set_webrender_image_key(webrender_api: &webrender_api::RenderApi, image: &mut
         },
     };
     let descriptor = webrender_api::ImageDescriptor {
-        size: webrender_api::DeviceIntSize::new(image.width as i32, image.height as i32),
+        size: DeviceIntSize::new(image.width as i32, image.height as i32),
         stride: None,
         format: webrender_api::ImageFormat::BGRA8,
         offset: 0,

components/script/dom/screen.rs

@@ -16,7 +16,7 @@ use euclid::TypedSize2D;
 use profile_traits::ipc;
 use script_traits::ScriptMsg;
 use style_traits::CSSPixel;
-use webrender_api::DeviceIntSize;
+use webrender_api::units::DeviceIntSize;
 
 #[dom_struct]
 pub struct Screen {

components/script/dom/window.rs

@@ -132,7 +132,8 @@ use style::str::HTML_SPACE_CHARACTERS;
 use style::stylesheets::CssRuleType;
 use style_traits::{CSSPixel, DevicePixel, ParsingMode};
 use url::Position;
-use webrender_api::{DeviceIntPoint, DeviceIntSize, DocumentId, ExternalScrollId, RenderApiSender};
+use webrender_api::units::{DeviceIntPoint, DeviceIntSize};
+use webrender_api::{DocumentId, ExternalScrollId, RenderApiSender};
 use webvr_traits::WebVRMsg;
 
 /// Current state of the window object

components/script_traits/lib.rs

@@ -58,9 +58,8 @@ use std::sync::Arc;
 use std::time::Duration;
 use style_traits::CSSPixel;
 use style_traits::SpeculativePainter;
-use webrender_api::{
+use webrender_api::units::{DeviceIntSize, DevicePixel};
-    DeviceIntSize, DevicePixel, DocumentId, ExternalScrollId, ImageKey, RenderApiSender,
+use webrender_api::{DocumentId, ExternalScrollId, ImageKey, RenderApiSender};
-};
 use webvr_traits::{WebVREvent, WebVRMsg};
 
 pub use crate::script_msg::{

components/script_traits/script_msg.rs

@@ -28,7 +28,7 @@ use servo_url::ServoUrl;
 use std::fmt;
 use style_traits::viewport::ViewportConstraints;
 use style_traits::CSSPixel;
-use webrender_api::{DeviceIntPoint, DeviceIntSize};
+use webrender_api::units::{DeviceIntPoint, DeviceIntSize};
 
 /// A particular iframe's size, associated with a browsing context.
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]

components/servo/lib.rs

@@ -84,6 +84,7 @@ use constellation::{FromCompositorLogger, FromScriptLogger};
 use crossbeam_channel::{unbounded, Sender};
 use embedder_traits::{EmbedderMsg, EmbedderProxy, EmbedderReceiver, EventLoopWaker};
 use env_logger::Builder as EnvLoggerBuilder;
+use euclid::TypedSize2D;
 #[cfg(all(
     not(target_os = "windows"),
     not(target_os = "ios"),
@@ -304,11 +305,19 @@ where
 
             let render_notifier = Box::new(RenderNotifier::new(compositor_proxy.clone()));
 
+            // Cast from `DeviceIndependentPixel` to `DevicePixel`
+            let device_pixel_ratio = coordinates.hidpi_factor.get();
+            let window_size = TypedSize2D::from_untyped(
+                &(opts.initial_window_size.to_f32() / device_pixel_ratio)
+                    .to_i32()
+                    .to_untyped(),
+            );
+
             webrender::Renderer::new(
                 window.gl(),
                 render_notifier,
                 webrender::RendererOptions {
-                    device_pixel_ratio: coordinates.hidpi_factor.get(),
+                    device_pixel_ratio,
                     resource_override_path: opts.shaders_dir.clone(),
                     enable_aa: opts.enable_text_antialiasing,
                     debug_flags: debug_flags,
@@ -324,6 +333,7 @@ where
                     ..Default::default()
                 },
                 None,
+                window_size,
             )
             .expect("Unable to initialize webrender!")
         };

components/style_traits/lib.rs

@@ -36,7 +36,7 @@ extern crate to_shmem_derive;
 #[cfg(feature = "servo")]
 extern crate webrender_api;
 #[cfg(feature = "servo")]
-pub use webrender_api::DevicePixel;
+pub use webrender_api::units::DevicePixel;
 
 use cssparser::{CowRcStr, Token};
 use selectors::parser::SelectorParseErrorKind;

components/webrender_traits/lib.rs

@@ -7,6 +7,7 @@
 use euclid::Size2D;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
+use webrender_api::units::TexelRect;
 
 /// This trait is used as a bridge between the different GL clients
 /// in Servo that handles WebRender ExternalImages and the WebRender
@@ -117,14 +118,14 @@ impl webrender::ExternalImageHandler for WebrenderExternalImageHandlers {
                 let (texture_id, size) = self.webgl_handler.as_mut().unwrap().lock(key.0);
                 (
                     texture_id,
-                    webrender_api::TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
+                    TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
                 )
             },
             WebrenderImageHandlerType::Media => {
                 let (texture_id, size) = self.media_handler.as_mut().unwrap().lock(key.0);
                 (
                     texture_id,
-                    webrender_api::TexelRect::new(0.0, 0.0, size.width as f32, size.height as f32),
+                    TexelRect::new(0.0, 0.0, size.width as f32, size.height as f32),
                 )
             },
         };

ports/glutin/headed_window.rs

@@ -27,9 +27,8 @@ use servo::script_traits::{TouchEventType, WheelMode, WheelDelta};
 use servo::servo_config::{opts, pref};
 use servo::servo_geometry::DeviceIndependentPixel;
 use servo::style_traits::DevicePixel;
-use servo::webrender_api::{
+use servo::webrender_api::ScrollLocation;
-    DeviceIntPoint, DeviceIntRect, DeviceIntSize, FramebufferIntSize, ScrollLocation,
+use servo::webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize};
-};
 use servo_media::player::context::{GlApi, GlContext as PlayerGLContext, NativeDisplay};
 use std::cell::{Cell, RefCell};
 use std::mem;
@@ -500,7 +499,7 @@ impl WindowMethods for Window {
             .expect("Failed to get window inner size.");
         let inner_size = (TypedSize2D::new(width as f32, height as f32) * dpr).to_i32();
         let viewport = DeviceIntRect::new(TypedPoint2D::zero(), inner_size);
-        let framebuffer = FramebufferIntSize::from_untyped(&viewport.size.to_untyped());
+        let framebuffer = DeviceIntSize::from_untyped(&viewport.size.to_untyped());
 
         EmbedderCoordinates {
             viewport,

ports/glutin/headless_window.rs

@@ -13,7 +13,7 @@ use servo::compositing::windowing::{EmbedderCoordinates, WindowMethods};
 use servo::servo_config::opts;
 use servo::servo_geometry::DeviceIndependentPixel;
 use servo::style_traits::DevicePixel;
-use servo::webrender_api::{DeviceIntRect, FramebufferIntSize};
+use servo::webrender_api::units::{DeviceIntRect, DeviceIntSize};
 use servo_media::player::context as MediaPlayerCtxt;
 use std::cell::Cell;
 #[cfg(any(target_os = "linux", target_os = "macos"))]
@@ -178,7 +178,7 @@ impl WindowMethods for Window {
         let size =
             (TypedSize2D::new(self.context.width, self.context.height).to_f32() * dpr).to_i32();
         let viewport = DeviceIntRect::new(TypedPoint2D::zero(), size);
-        let framebuffer = FramebufferIntSize::from_untyped(&size.to_untyped());
+        let framebuffer = DeviceIntSize::from_untyped(&size.to_untyped());
         EmbedderCoordinates {
             viewport,
             framebuffer,

ports/glutin/window_trait.rs

@@ -8,7 +8,7 @@
 use glutin;
 use servo::compositing::windowing::{WindowEvent, WindowMethods};
 use servo::embedder_traits::Cursor;
-use servo::webrender_api::{DeviceIntPoint, DeviceIntSize};
+use servo::webrender_api::units::{DeviceIntPoint, DeviceIntSize};
 
 // This should vary by zoom level and maybe actual text size (focused or under cursor)
 pub const LINE_HEIGHT: f32 = 38.0;

ports/libmlservo/src/lib.rs

@@ -14,9 +14,7 @@ use rust_webvr::api::MagicLeapVRService;
 use servo::euclid::TypedScale;
 use servo::keyboard_types::Key;
 use servo::servo_url::ServoUrl;
-use servo::webrender_api::DevicePixel;
+use servo::webrender_api::units::{DevicePixel, DevicePoint, LayoutPixel};
-use servo::webrender_api::DevicePoint;
-use servo::webrender_api::LayoutPixel;
 use simpleservo::{self, deinit, gl_glue, MouseButton, ServoGlue, SERVO};
 use simpleservo::{Coordinates, EventLoopWaker, HostTrait, InitOptions, VRInitOptions};
 use smallvec::SmallVec;

ports/libsimpleservo/api/src/lib.rs

@@ -22,7 +22,8 @@ use servo::script_traits::{TouchEventType, TouchId};
 use servo::servo_config::opts;
 use servo::servo_config::{pref, set_pref};
 use servo::servo_url::ServoUrl;
-use servo::webrender_api::{DevicePixel, FramebufferPixel, ScrollLocation};
+use servo::webrender_api::units::DevicePixel;
+use servo::webrender_api::ScrollLocation;
 use servo::webvr::{VRExternalShmemPtr, VRMainThreadHeartbeat, VRService, VRServiceManager};
 use servo::{self, gl, BrowserId, Servo};
 use servo_media::player::context as MediaPlayerContext;
@@ -61,7 +62,7 @@ pub enum VRInitOptions {
 #[derive(Clone, Debug)]
 pub struct Coordinates {
     pub viewport: TypedRect<i32, DevicePixel>,
-    pub framebuffer: TypedSize2D<i32, FramebufferPixel>,
+    pub framebuffer: TypedSize2D<i32, DevicePixel>,
 }
 
 impl Coordinates {

python/tidy/servo_tidy/tidy.py

@@ -371,6 +371,10 @@ def check_lock(file_name, contents):
             source = "crates.io"
         packages_by_name.setdefault(package["name"], []).append((package["version"], source))
 
+    for name in exceptions:
+        if name not in packages_by_name:
+            yield (1, "duplicates are allowed for `{}` but it is not a dependency".format(name))
+
     for (name, packages) in packages_by_name.iteritems():
         has_duplicates = len(packages) > 1
         duplicates_allowed = name in exceptions

servo-tidy.toml

@@ -35,7 +35,6 @@ packages = [
   "crossbeam-deque",
   "crossbeam-epoch",
   "crossbeam-utils",
-  "dwrote",
   "gl_generator", # https://github.com/servo/servo/pull/23288#issuecomment-494687746
   "lock_api",
   "memmap",
@@ -46,7 +45,6 @@ packages = [
   "rand_core",
   "scopeguard",
   "unicase",
-  "ws",
 ]
 # Files that are ignored for all tidy and lint checks.
 files = [

tests/unit/metrics/paint_time.rs

@@ -9,7 +9,8 @@ use metrics::{PaintTimeMetrics, ProfilerMetadataFactory, ProgressiveWebMetric};
 use msg::constellation_msg::TEST_PIPELINE_ID;
 use profile_traits::time::{ProfilerChan, TimerMetadata};
 use servo_url::ServoUrl;
-use webrender_api::{AlphaType, ColorF, ImageDisplayItem, ImageKey, ImageRendering, LayoutSize};
+use webrender_api::units::{LayoutRect, LayoutSize};
+use webrender_api::{AlphaType, ColorF, ImageDisplayItem, ImageKey, ImageRendering};
 
 struct DummyProfilerMetadataFactory {}
 impl ProfilerMetadataFactory for DummyProfilerMetadataFactory {
@@ -118,6 +119,8 @@ fn test_first_contentful_paint_setter() {
     let image = DisplayItem::Image(CommonDisplayItem::new(
         BaseDisplayItem::empty(),
         ImageDisplayItem {
+            bounds: LayoutRect::zero(),
+            common: layout::display_list::items::empty_common_item_properties(),
             image_key: ImageKey::DUMMY,
             stretch_size: LayoutSize::zero(),
             tile_spacing: LayoutSize::zero(),

tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini

@@ -1,3 +1,4 @@
 [mix-blend-mode-both-parent-and-blended-with-3D-transform.html]
   type: reftest
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL

tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini

@@ -0,0 +1,2 @@
+[mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html]
+  fuzzy: /css/compositing/mix-blend-mode/reference/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius-ref.html:9;8

tests/wpt/mozilla/meta/css/text_decoration_underline_subpx_a.html.ini

@@ -0,0 +1,4 @@
+[text_decoration_underline_subpx_a.html]
+  bug: https://github.com/servo/servo/issues/23569
+  expected:
+    if os == "linux": FAIL