diff options
| -rw-r--r-- | Cargo.lock | 116 | ||||
| -rw-r--r-- | components/layout/webrender_helpers.rs | 11 | ||||
| -rw-r--r-- | components/layout_thread/lib.rs | 2 | ||||
| -rw-r--r-- | tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-parent-with-border-radius.htm.ini | 3 |
4 files changed, 64 insertions, 68 deletions
diff --git a/Cargo.lock b/Cargo.lock index 022304ab836..d28d1a0a49d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,7 +2,7 @@ name = "webvr_traits" version = "0.0.1" dependencies = [ - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rust-webvr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "bincode" -version = "1.0.0-alpha2" +version = "1.0.0-alpha6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -213,7 +213,7 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "bluetooth_traits 0.0.1", "device 0.0.1 (git+https://github.com/servo/devices)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "servo_rand 0.0.1", "tinyfiledialogs 2.5.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -224,7 +224,7 @@ dependencies = [ name = "bluetooth_traits" version = "0.0.1" dependencies = [ - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -292,12 +292,12 @@ dependencies = [ "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -308,10 +308,10 @@ dependencies = [ "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -421,7 +421,7 @@ dependencies = [ "gfx_traits 0.0.1", "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -432,8 +432,8 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender 0.27.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender 0.30.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -451,7 +451,7 @@ dependencies = [ "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gfx_traits 0.0.1", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "layout_traits 0.0.1", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -467,7 +467,7 @@ dependencies = [ "servo_remutex 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -619,7 +619,7 @@ dependencies = [ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -637,7 +637,7 @@ dependencies = [ "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -709,7 +709,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -974,7 +974,7 @@ dependencies = [ "harfbuzz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -995,7 +995,7 @@ dependencies = [ "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1004,7 +1004,7 @@ name = "gfx_tests" version = "0.0.1" dependencies = [ "gfx 0.0.1", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", ] @@ -1074,7 +1074,7 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1276,10 +1276,10 @@ dependencies = [ [[package]] name = "ipc-channel" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bincode 1.0.0-alpha2 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1360,7 +1360,7 @@ dependencies = [ "gfx_traits 0.0.1", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever-atoms 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1384,7 +1384,7 @@ dependencies = [ "style_traits 0.0.1", "unicode-bidi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1404,7 +1404,7 @@ dependencies = [ "gfx 0.0.1", "gfx_traits 0.0.1", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_traits 0.0.1", "lazy_static 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1424,7 +1424,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style 0.0.1", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1432,13 +1432,13 @@ name = "layout_traits" version = "0.0.1" dependencies = [ "gfx 0.0.1", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", "servo_url 0.0.1", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1498,7 +1498,7 @@ dependencies = [ "gaol 0.0.1 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "layout_thread 0.0.1", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1515,8 +1515,8 @@ dependencies = [ "style 0.0.1", "style_traits 0.0.1", "webdriver_server 0.0.1", - "webrender 0.27.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender 0.30.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", ] @@ -1665,7 +1665,7 @@ dependencies = [ "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1686,7 +1686,7 @@ dependencies = [ "hyper-openssl 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "immeta 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1707,7 +1707,7 @@ dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1732,7 +1732,7 @@ dependencies = [ "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-openssl 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", @@ -1755,7 +1755,7 @@ dependencies = [ "hyper_serde 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", "immeta 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1767,7 +1767,7 @@ dependencies = [ "servo_url 0.0.1", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -2047,7 +2047,7 @@ name = "profile" version = "0.0.1" dependencies = [ "heartbeats-simple 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", @@ -2064,7 +2064,7 @@ dependencies = [ name = "profile_tests" version = "0.0.1" dependencies = [ - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "profile 0.0.1", "profile_traits 0.0.1", ] @@ -2075,7 +2075,7 @@ version = "0.0.1" dependencies = [ "energy-monitor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "energymon 0.3.0 (git+https://github.com/energymon/energymon-rust.git)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2247,7 +2247,7 @@ dependencies = [ "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.4 (git+https://github.com/servo/rust-mozjs)", "jstraceable_derive 0.0.1", "lazy_static 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2287,7 +2287,7 @@ dependencies = [ "tinyfiledialogs 2.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", "xml5ever 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2306,7 +2306,7 @@ dependencies = [ "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever-atoms 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -2348,7 +2348,7 @@ dependencies = [ "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -3129,7 +3129,7 @@ dependencies = [ "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", @@ -3145,11 +3145,11 @@ dependencies = [ [[package]] name = "webrender" -version = "0.27.0" -source = "git+https://github.com/servo/webrender#4b72bb1921628d01b08ab356c0f2365a927b711e" +version = "0.30.0" +source = "git+https://github.com/servo/webrender#7e74c1018d47cf5586f05c409c17a25c76f28e56" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bincode 1.0.0-alpha2 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3168,13 +3168,13 @@ dependencies = [ "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "webrender_traits" -version = "0.28.0" -source = "git+https://github.com/servo/webrender#4b72bb1921628d01b08ab356c0f2365a927b711e" +version = "0.31.0" +source = "git+https://github.com/servo/webrender#7e74c1018d47cf5586f05c409c17a25c76f28e56" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3183,7 +3183,7 @@ dependencies = [ "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3193,12 +3193,12 @@ dependencies = [ name = "webvr" version = "0.0.1" dependencies = [ - "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "script_traits 0.0.1", "servo_config 0.0.1", - "webrender_traits 0.28.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.31.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -3306,7 +3306,7 @@ dependencies = [ "checksum backtrace 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f551bc2ddd53aea015d453ef0b635af89444afa5ed2405dd0b2062ad5d600d80" "checksum backtrace-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d192fd129132fbc97497c1f2ec2c2c5174e376b95f535199ef4fe0a293d33842" "checksum base64 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9892882c3bd89ed02dec391c128984c772b663a29700c32b5de0b33861cdf2bd" -"checksum bincode 1.0.0-alpha2 (registry+https://github.com/rust-lang/crates.io-index)" = "62650bb5651ba8f0580cebf4ef255d791b8b0ef53800322661e1bb5791d42966" +"checksum bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)" = "fb0cdeac1c5d567fdb487ae5853c024e4acf1ea85ba6a6552fe084e0805fea5d" "checksum bindgen 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "facc480c409c373db3c870e377ce223e5e07d979efc2604691dc6f583e8ded0f" "checksum bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c" "checksum bit-vec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5b97c2c8e8bbb4251754f559df8af22fb264853c7d009084a576cdf12565089d" @@ -3396,7 +3396,7 @@ dependencies = [ "checksum inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" "checksum io-surface 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c35a3278fa52fb070fdc874dfd057163e6c21e0a9295f87f54daee9dd5530b43" "checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be" -"checksum ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc12beb3f43e226410d7f26a77aec73efbf0c11875a8131adc09f30a8219f22e" +"checksum ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f1e8d7f511a1e2dae4e26efac30a85d2376b67d7c6f2c691ea95ebd850b017da" "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" "checksum jpeg-decoder 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "5c4ff3d14e7ef3522471ab712832c3dd50001f7fb7aa4cdc48af811d63b531e9" "checksum js 0.1.4 (git+https://github.com/servo/rust-mozjs)" = "<none>" @@ -3537,8 +3537,8 @@ dependencies = [ "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff" "checksum webdriver 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d548aabf87411b1b4ba91fd07eacd8b238135c7131a452b8a9f6386209167e18" -"checksum webrender 0.27.0 (git+https://github.com/servo/webrender)" = "<none>" -"checksum webrender_traits 0.28.0 (git+https://github.com/servo/webrender)" = "<none>" +"checksum webrender 0.30.0 (git+https://github.com/servo/webrender)" = "<none>" +"checksum webrender_traits 0.31.0 (git+https://github.com/servo/webrender)" = "<none>" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum ws 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04614a58714f3fd4a8b1da4bcae9f031c532d35988c3d39627619248113f8be8" diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs index ec83eb996e2..8f1f76f413f 100644 --- a/components/layout/webrender_helpers.rs +++ b/components/layout/webrender_helpers.rs @@ -370,12 +370,11 @@ impl WebRenderDisplayItemConverter for DisplayItem { let start_point = item.gradient.start_point.to_pointf(); let end_point = item.gradient.end_point.to_pointf(); let clip = item.base.clip.to_clip_region(builder); - builder.push_gradient(rect, - clip, - start_point, - end_point, - item.gradient.stops.clone(), - ExtendMode::Clamp); + let gradient = builder.create_gradient(start_point, + end_point, + item.gradient.stops.clone(), + ExtendMode::Clamp); + builder.push_gradient(rect, clip, gradient); } DisplayItem::Line(..) => { println!("TODO DisplayItem::Line"); diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 29daff9b696..2d9b921391f 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -935,7 +935,7 @@ impl LayoutThread { let Epoch(epoch_number) = self.epoch; let viewport_size = webrender_traits::LayoutSize::from_untyped(&viewport_size); - self.webrender_api.set_root_display_list( + self.webrender_api.set_display_list( Some(get_root_flow_background_color(layout_root)), webrender_traits::Epoch(epoch_number), viewport_size, diff --git a/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-parent-with-border-radius.htm.ini b/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-parent-with-border-radius.htm.ini deleted file mode 100644 index bdd69225444..00000000000 --- a/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-parent-with-border-radius.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[mix-blend-mode-parent-with-border-radius.htm] - type: reftest - expected: FAIL |