diff options
61 files changed, 218 insertions, 186 deletions
diff --git a/Cargo.lock b/Cargo.lock index db3c6056a9b..b5fa944ac8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -409,12 +409,6 @@ dependencies = [ ] [[package]] -name = "build_const" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" - -[[package]] name = "byte-slice-cast" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -427,10 +421,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "980479e6fde23246dfb54d47580d66b4e99202e7579c5eaa9fe10ecb5ebd2182" [[package]] +name = "bytemuck" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431" + +[[package]] name = "byteorder" -version = "1.2.7" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "bytes" @@ -485,7 +485,7 @@ dependencies = [ "embedder_traits", "euclid", "fnv", - "gleam 0.6.18", + "gleam 0.9.2", "half", "ipc-channel", "log", @@ -549,7 +549,7 @@ dependencies = [ "quote 1.0.2", "serde", "serde_json", - "syn 1.0.3", + "syn", "tempfile", "toml", ] @@ -745,7 +745,7 @@ dependencies = [ "embedder_traits", "euclid", "gfx_traits", - "gleam 0.6.18", + "gleam 0.9.2", "image", "ipc-channel", "keyboard-types", @@ -928,15 +928,6 @@ dependencies = [ ] [[package]] -name = "crc" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" -dependencies = [ - "build_const", -] - -[[package]] name = "crc32fast" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1014,7 +1005,7 @@ dependencies = [ "quote 1.0.2", "serde", "smallvec 0.6.10", - "syn 1.0.3", + "syn", ] [[package]] @@ -1024,7 +1015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" dependencies = [ "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -1044,7 +1035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd670e5ff58768ef624207fb95709ce63b8d05573fb9a05165f0eef471ea6a3a" dependencies = [ "procedural-masquerade", - "syn 1.0.3", + "syn", ] [[package]] @@ -1078,7 +1069,7 @@ dependencies = [ "ident_case", "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -1089,7 +1080,7 @@ checksum = "0cd3e432e52c0810b72898296a69d66b1d78d1517dff6cde7a130557a55a62c1" dependencies = [ "darling_core", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -1134,7 +1125,7 @@ dependencies = [ name = "deny_public_fields" version = "0.0.1" dependencies = [ - "syn 1.0.3", + "syn", "synstructure", ] @@ -1152,31 +1143,19 @@ dependencies = [ "darling", "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", "synstructure", ] [[package]] name = "derive_more" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f57d78cf3bd45270dad4e70c21ec77a960b36c7a841ff9db76aaa775a8fb871" -dependencies = [ - "proc-macro2 0.4.26", - "quote 0.6.12", - "rustc_version", - "syn 0.15.39", -] - -[[package]] -name = "derive_more" version = "0.99.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2159be042979966de68315bce7034bb000c775f22e3e834e1c52ff78f041cae8" dependencies = [ "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -1292,7 +1271,7 @@ name = "dom_struct" version = "0.0.1" dependencies = [ "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -1301,7 +1280,7 @@ version = "0.0.1" dependencies = [ "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -1431,7 +1410,7 @@ checksum = "1df9d0cef4b051baf3ef7f9b1674273dc78cd56e02cba60fa187f9c0ff4ff5e0" dependencies = [ "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -1498,13 +1477,14 @@ checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" [[package]] name = "flate2" -version = "1.0.1" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fac2277e84e5e858483756647a9d0aa8d9a2b7cba517fd84325a0aaa69a0909" +checksum = "ad3c5233c9a940c8719031b423d7e6c16af66e031cb0420b0896f5245bf181d3" dependencies = [ + "cfg-if", + "crc32fast", "libc", - "miniz-sys", - "miniz_oxide_c_api", + "miniz_oxide", ] [[package]] @@ -1661,7 +1641,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -1959,6 +1939,17 @@ dependencies = [ ] [[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] name = "gleam" version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1977,6 +1968,15 @@ dependencies = [ ] [[package]] +name = "gleam" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332d1f4e6c6181ed07178f84a552b2387d43ecf6821a86c22cfb3883ea3fb1b9" +dependencies = [ + "gl_generator 0.14.0", +] + +[[package]] name = "glib" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2522,7 +2522,7 @@ dependencies = [ "markup5ever", "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -2646,14 +2646,14 @@ dependencies = [ [[package]] name = "image" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "663a975007e0b49903e2e8ac0db2c432c465855f2d65f17883ba1476e85f0b42" +checksum = "ef4e336ec01a678e7ab692914c641181528e8656451e6252f8f9e33728882eaf" dependencies = [ + "bytemuck", "byteorder", "gif", "jpeg-decoder", - "lzw", "num-iter", "num-rational", "num-traits", @@ -2815,7 +2815,7 @@ name = "jstraceable_derive" version = "0.0.1" dependencies = [ "proc-macro2 1.0.1", - "syn 1.0.3", + "syn", "synstructure", ] @@ -3138,7 +3138,7 @@ dependencies = [ "euclid", "gaol", "gfx", - "gleam 0.6.18", + "gleam 0.9.2", "gstreamer", "ipc-channel", "keyboard-types", @@ -3342,7 +3342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b" dependencies = [ "proc-macro2 1.0.1", - "syn 1.0.3", + "syn", "synstructure", ] @@ -3494,24 +3494,11 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.1.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba430291c9d6cedae28bcd2d49d1c32fc57d60cd49086646c5dd5673a870eb5" +checksum = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" dependencies = [ "adler32", - "libc", -] - -[[package]] -name = "miniz_oxide_c_api" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5b8234d6103ebfba71e29786da4608540f862de5ce980a1c94f86a40ca0d51" -dependencies = [ - "cc", - "crc", - "libc", - "miniz_oxide", ] [[package]] @@ -3778,14 +3765,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af1847c907c2f04d7bfd572fb25bbb4385c637fe5be163cf2f8c5d778fe1e7d" +checksum = "0c8b15b261814f992e33760b1fca9fe8b693d8a65299f20c9901688636cfb746" dependencies = [ - "num-traits", - "proc-macro2 0.4.26", - "quote 0.6.12", - "syn 0.15.39", + "proc-macro2 1.0.1", + "quote 1.0.2", + "syn", ] [[package]] @@ -4022,13 +4008,13 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] name = "peek-poke" version = "0.2.0" -source = "git+https://github.com/servo/webrender#edac864107cf43732ec66a9d3288e869a70ce1de" +source = "git+https://github.com/servo/webrender#4ba17a61580a03b68881ffba7ee22bcf8e1aac72" dependencies = [ "euclid", "peek-poke-derive 0.2.1", @@ -4049,17 +4035,17 @@ source = "git+https://github.com/kvark/peek-poke?rev=969bd7fe2be1a83f87916dc8b38 dependencies = [ "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] name = "peek-poke-derive" version = "0.2.1" -source = "git+https://github.com/servo/webrender#edac864107cf43732ec66a9d3288e869a70ce1de" +source = "git+https://github.com/servo/webrender#4ba17a61580a03b68881ffba7ee22bcf8e1aac72" dependencies = [ "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", "synstructure", "unicode-xid 0.2.0", ] @@ -4128,7 +4114,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -4176,9 +4162,9 @@ dependencies = [ [[package]] name = "png" -version = "0.15.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8422b27bb2c013dd97b9aef69e161ce262236f49aaf46a0489011c8ff0264602" +checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283" dependencies = [ "bitflags", "crc32fast", @@ -4212,7 +4198,7 @@ checksum = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8" dependencies = [ "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -4582,14 +4568,14 @@ dependencies = [ [[package]] name = "rust-webvr" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feaf62b8a5271e024d426548d61d26b588e476b1b631af31f960f9995cdb8257" +checksum = "593fdfff23790ead23b7921b9b69cdfdb69ce7374dc8363f011c02a4cc7c7e14" dependencies = [ "bindgen", "euclid", "gl_generator 0.13.1", - "gleam 0.6.18", + "gleam 0.9.2", "glutin", "gvr-sys", "libc", @@ -4874,7 +4860,7 @@ version = "0.22.0" dependencies = [ "bitflags", "cssparser", - "derive_more 0.99.2", + "derive_more", "fxhash", "log", "phf", @@ -4928,7 +4914,7 @@ checksum = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" dependencies = [ "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -4964,7 +4950,7 @@ dependencies = [ "clipboard", "euclid", "getopts", - "gleam 0.6.18", + "gleam 0.9.2", "glutin", "image", "keyboard-types", @@ -5031,7 +5017,7 @@ version = "0.0.1" dependencies = [ "crossbeam-channel", "euclid", - "gleam 0.6.18", + "gleam 0.9.2", "glib", "gst-plugin-version-helper", "gstreamer", @@ -5256,7 +5242,7 @@ dependencies = [ "itertools", "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -5277,7 +5263,7 @@ source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f dependencies = [ "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", ] [[package]] @@ -5594,7 +5580,7 @@ dependencies = [ "byteorder", "crossbeam-channel", "cssparser", - "derive_more 0.99.2", + "derive_more", "encoding_rs", "euclid", "fallible", @@ -5649,7 +5635,7 @@ dependencies = [ "derive_common", "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", "synstructure", ] @@ -5803,17 +5789,6 @@ checksum = "e454d048db5527d000bfddb77bd072bbf3a1e2ae785f16d9bd116e07c2ab45eb" [[package]] name = "syn" -version = "0.15.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d960b829a55e56db167e861ddb43602c003c7be0bee1d345021703fac2fb7c" -dependencies = [ - "proc-macro2 0.4.26", - "quote 0.6.12", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "158521e6f544e7e3dcfc370ac180794aa38cb34a1b1e07609376d4adcf429b93" @@ -5831,7 +5806,7 @@ checksum = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203" dependencies = [ "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", "unicode-xid 0.2.0", ] @@ -5926,14 +5901,13 @@ checksum = "5920e77802b177479ab5795767fa48e68f61b2f516c2ac0041e2978dd8efe483" [[package]] name = "tiff" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d" +checksum = "002351e428db1eb1d8656d4ca61947c3519ac3191e1c804d4600cd32093b77ad" dependencies = [ "byteorder", "lzw", - "num-derive", - "num-traits", + "miniz_oxide", ] [[package]] @@ -5983,7 +5957,7 @@ dependencies = [ "derive_common", "proc-macro2 1.0.1", "quote 1.0.2", - "syn 1.0.3", + "syn", "synstructure", ] @@ -6566,8 +6540,8 @@ dependencies = [ [[package]] name = "webrender" -version = "0.60.0" -source = "git+https://github.com/servo/webrender#edac864107cf43732ec66a9d3288e869a70ce1de" +version = "0.61.0" +source = "git+https://github.com/servo/webrender#4ba17a61580a03b68881ffba7ee22bcf8e1aac72" dependencies = [ "base64 0.10.1", "bincode", @@ -6582,7 +6556,7 @@ dependencies = [ "euclid", "freetype", "fxhash", - "gleam 0.6.18", + "gleam 0.9.2", "image", "lazy_static", "libc", @@ -6607,15 +6581,15 @@ dependencies = [ [[package]] name = "webrender_api" -version = "0.60.0" -source = "git+https://github.com/servo/webrender#edac864107cf43732ec66a9d3288e869a70ce1de" +version = "0.61.0" +source = "git+https://github.com/servo/webrender#4ba17a61580a03b68881ffba7ee22bcf8e1aac72" dependencies = [ "app_units", "bitflags", "byteorder", "core-foundation 0.6.4", "core-graphics 0.17.3", - "derive_more 0.13.0", + "derive_more", "euclid", "malloc_size_of_derive", "peek-poke 0.2.0 (git+https://github.com/servo/webrender)", @@ -6629,7 +6603,7 @@ dependencies = [ [[package]] name = "webrender_build" version = "0.0.1" -source = "git+https://github.com/servo/webrender#edac864107cf43732ec66a9d3288e869a70ce1de" +source = "git+https://github.com/servo/webrender#4ba17a61580a03b68881ffba7ee22bcf8e1aac72" dependencies = [ "sha2", ] @@ -6673,12 +6647,12 @@ dependencies = [ [[package]] name = "webxr" version = "0.0.1" -source = "git+https://github.com/servo/webxr#68b024221b8c72b5b33a63441d63803a13eadf03" +source = "git+https://github.com/servo/webxr#720a479bc21ff123569c26a47a5eb7c7cfa07fd6" dependencies = [ "bindgen", "euclid", "gl_generator 0.13.1", - "gleam 0.6.18", + "gleam 0.9.2", "glutin", "log", "openxr", @@ -6694,7 +6668,7 @@ dependencies = [ [[package]] name = "webxr-api" version = "0.0.1" -source = "git+https://github.com/servo/webxr#68b024221b8c72b5b33a63441d63803a13eadf03" +source = "git+https://github.com/servo/webxr#720a479bc21ff123569c26a47a5eb7c7cfa07fd6" dependencies = [ "euclid", "ipc-channel", @@ -6822,7 +6796,7 @@ dependencies = [ [[package]] name = "wr_malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/webrender#edac864107cf43732ec66a9d3288e869a70ce1de" +source = "git+https://github.com/servo/webrender#4ba17a61580a03b68881ffba7ee22bcf8e1aac72" dependencies = [ "app_units", "euclid", diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 3ad24bea445..ab81c6672da 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -25,7 +25,7 @@ cssparser = "0.27" embedder_traits = {path = "../embedder_traits"} euclid = "0.20" fnv = "1.0" -gleam = "0.6.7" +gleam = "0.9" half = "1" ipc-channel = "0.14" log = "0.4" diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs index 823999b3c98..b8b756da903 100644 --- a/components/canvas/canvas_data.rs +++ b/components/canvas/canvas_data.rs @@ -942,8 +942,7 @@ impl<'a> CanvasData<'a> { stride: None, format: webrender_api::ImageFormat::BGRA8, offset: 0, - is_opaque: false, - allow_mipmaps: false, + flags: webrender_api::ImageDescriptorFlags::empty(), }; let data = self.drawtarget.snapshot_data_owned(); let data = webrender_api::ImageData::Raw(Arc::new(data)); diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs index 079928c9d57..5ecf7183914 100644 --- a/components/canvas/webgl_thread.rs +++ b/components/canvas/webgl_thread.rs @@ -945,13 +945,14 @@ impl WebGLThread { /// Helper function to create a `webrender_api::ImageDescriptor`. fn image_descriptor(size: Size2D<i32>, alpha: bool) -> webrender_api::ImageDescriptor { + let mut flags = webrender_api::ImageDescriptorFlags::empty(); + flags.set(webrender_api::ImageDescriptorFlags::IS_OPAQUE, !alpha); webrender_api::ImageDescriptor { size: webrender_api::units::DeviceIntSize::new(size.width, size.height), stride: None, format: webrender_api::ImageFormat::BGRA8, offset: 0, - is_opaque: !alpha, - allow_mipmaps: false, + flags, } } diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index 057090d3dda..70f40e3b568 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -20,8 +20,8 @@ crossbeam-channel = "0.4" embedder_traits = {path = "../embedder_traits"} euclid = "0.20" gfx_traits = {path = "../gfx_traits"} -gleam = {version = "0.6", optional = true} -image = "0.22" +gleam = {version = "0.9", optional = true} +image = "0.23" ipc-channel = "0.14" libc = "0.2" keyboard-types = "0.4.3" @@ -31,7 +31,7 @@ net_traits = {path = "../net_traits"} num-traits = "0.2" pixels = {path = "../pixels", optional = true} profile_traits = {path = "../profile_traits"} -rust-webvr = {version = "0.17", features = ["mock", "openvr", "vrexternal"]} +rust-webvr = {version = "0.18", features = ["mock", "openvr", "vrexternal"]} script_traits = {path = "../script_traits"} servo_geometry = {path = "../geometry"} servo-media = {git = "https://github.com/servo/media"} diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index aa58e10b05f..c5c33afbf6b 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -1396,7 +1396,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> { FramebufferUintLength::new(height), ); let dynamic_image = DynamicImage::ImageRgb8(img); - if let Err(e) = dynamic_image.write_to(&mut file, ImageFormat::PNG) + if let Err(e) = dynamic_image.write_to(&mut file, ImageFormat::Png) { error!("Failed to save {} ({}).", path, e); } diff --git a/components/embedder_traits/Cargo.toml b/components/embedder_traits/Cargo.toml index c7febfb7c5b..8095771d28d 100644 --- a/components/embedder_traits/Cargo.toml +++ b/components/embedder_traits/Cargo.toml @@ -18,7 +18,7 @@ lazy_static = "1" log = "0.4" msg = {path = "../msg"} num-traits = "0.2" -num-derive = "0.2" +num-derive = "0.3" serde = "1.0" servo_url = {path = "../url"} webrender_api = {git = "https://github.com/servo/webrender"} diff --git a/components/layout/display_list/items.rs b/components/layout/display_list/items.rs index d7afa8423c0..ff276b674e4 100644 --- a/components/layout/display_list/items.rs +++ b/components/layout/display_list/items.rs @@ -454,6 +454,7 @@ pub fn empty_common_item_properties() -> CommonItemProperties { spatial_id: SpatialId::root_scroll_node(wr::PipelineId::dummy()), hit_info: None, flags: PrimitiveFlags::empty(), + item_key: None, } } diff --git a/components/layout/display_list/webrender_helpers.rs b/components/layout/display_list/webrender_helpers.rs index 51972fed316..973ef623d5a 100644 --- a/components/layout/display_list/webrender_helpers.rs +++ b/components/layout/display_list/webrender_helpers.rs @@ -338,5 +338,6 @@ fn build_common_item_properties( // TODO(gw): Make use of the WR backface visibility functionality. flags: PrimitiveFlags::default(), hit_info: tag, + item_key: None, } } diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs index 1a150401296..5a76997b2ad 100644 --- a/components/layout_thread_2020/lib.rs +++ b/components/layout_thread_2020/lib.rs @@ -1420,7 +1420,7 @@ impl LayoutThread { fragment_tree.print(); } if self.dump_display_list { - display_list.wr.print_display_list(); + display_list.wr.dump_serialized_display_list(); } debug!("Layout done!"); diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs index 57b6338dafb..b5f0c98d49d 100644 --- a/components/net/image_cache.rs +++ b/components/net/image_cache.rs @@ -21,6 +21,7 @@ use std::mem; use std::sync::{Arc, Mutex}; use std::thread; use webrender_api::units::DeviceIntSize; +use webrender_api::ImageDescriptorFlags; /// /// TODO(gw): Remaining work on image cache: @@ -75,13 +76,14 @@ fn set_webrender_image_key(webrender_api: &WebrenderIpcSender, image: &mut Image panic!("Not support by webrender yet"); }, }; + let mut flags = ImageDescriptorFlags::ALLOW_MIPMAPS; + flags.set(ImageDescriptorFlags::IS_OPAQUE, is_opaque); let descriptor = webrender_api::ImageDescriptor { size: DeviceIntSize::new(image.width as i32, image.height as i32), stride: None, format: webrender_api::ImageFormat::BGRA8, offset: 0, - is_opaque, - allow_mipmaps: true, + flags, }; let data = webrender_api::ImageData::new(bytes); let image_key = webrender_api.generate_image_key(); diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index e749467a594..46def57c7ad 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -20,7 +20,7 @@ headers = "0.2" http = "0.1" hyper = "0.12" hyper_serde = "0.11" -piston_image = {package = "image", version = "0.22"} +piston_image = {package = "image", version = "0.23"} ipc-channel = "0.14" lazy_static = "1" log = "0.4" diff --git a/components/net_traits/image/base.rs b/components/net_traits/image/base.rs index 262eaf476a7..6f090f12fe1 100644 --- a/components/net_traits/image/base.rs +++ b/components/net_traits/image/base.rs @@ -77,15 +77,15 @@ pub fn load_from_memory(buffer: &[u8], cors_status: CorsStatus) -> Option<Image> // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img pub fn detect_image_format(buffer: &[u8]) -> Result<ImageFormat, &str> { if is_gif(buffer) { - Ok(ImageFormat::GIF) + Ok(ImageFormat::Gif) } else if is_jpeg(buffer) { - Ok(ImageFormat::JPEG) + Ok(ImageFormat::Jpeg) } else if is_png(buffer) { - Ok(ImageFormat::PNG) + Ok(ImageFormat::Png) } else if is_bmp(buffer) { - Ok(ImageFormat::BMP) + Ok(ImageFormat::Bmp) } else if is_ico(buffer) { - Ok(ImageFormat::ICO) + Ok(ImageFormat::Ico) } else { Err("Image Format Not Supported") } diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 03eac6cae65..ed98282a0e5 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -61,7 +61,7 @@ html5ever = "0.25" http = "0.1" hyper = "0.12" hyper_serde = "0.11" -image = "0.22" +image = "0.23" indexmap = "1.0.2" ipc-channel = "0.14" itertools = "0.8" diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index e800a89bdf1..e56ca4a8266 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -392,7 +392,7 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement { // FIXME(nox): https://github.com/PistonDevelopers/image-png/issues/86 // FIXME(nox): https://github.com/PistonDevelopers/image-png/issues/87 PNGEncoder::new(&mut png) - .encode(&file, self.Width(), self.Height(), ColorType::RGBA(8)) + .encode(&file, self.Width(), self.Height(), ColorType::Rgba8) .unwrap(); let mut url = "data:image/png;base64,".to_owned(); // FIXME(nox): Should this use base64::URL_SAFE? diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 6cbb25157ff..f8c686d34f2 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -96,7 +96,8 @@ use std::rc::Rc; use std::sync::{Arc, Mutex}; use time::{self, Duration, Timespec}; use webrender_api::{ExternalImageData, ExternalImageId, ExternalImageType, TextureTarget}; -use webrender_api::{ImageData, ImageDescriptor, ImageFormat, ImageKey, Transaction}; +use webrender_api::{ImageData, ImageDescriptor, ImageDescriptorFlags, ImageFormat}; +use webrender_api::{ImageKey, Transaction}; #[derive(PartialEq)] enum FrameStatus { @@ -186,8 +187,7 @@ impl VideoFrameRenderer for MediaFrameRenderer { frame.get_width(), frame.get_height(), ImageFormat::BGRA8, - false, - false, + ImageDescriptorFlags::empty(), ); match self.current_frame { diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 8c975d604a6..c8d77f56683 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -55,7 +55,7 @@ embedder_traits = {path = "../embedder_traits"} env_logger = "0.6" euclid = "0.20" gfx = {path = "../gfx"} -gleam = "0.6" +gleam = "0.9" ipc-channel = "0.14" keyboard-types = "0.4" layout_thread_2013 = {path = "../layout_thread", optional = true} diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index f580d55b084..d6f685048a3 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -53,7 +53,7 @@ malloc_size_of_derive = "0.1" num_cpus = {version = "1.1.0"} num-integer = "0.1" num-traits = "0.2" -num-derive = "0.2" +num-derive = "0.3" owning_ref = "0.4" parking_lot = "0.9" precomputed-hash = "0.1.1" diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index 44033207ece..1ea3a1254a7 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -17,7 +17,7 @@ cookie = "0.11" crossbeam-channel = "0.4" euclid = "0.20" hyper = "0.12" -image = "0.22" +image = "0.23" ipc-channel = "0.14" keyboard-types = "0.4.3" log = "0.4" diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 6cf3db4bc18..6b63ebf0f6a 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -1583,7 +1583,7 @@ impl Handler { let rgb = RgbImage::from_raw(img.width, img.height, img.bytes.to_vec()).unwrap(); let mut png_data = Vec::new(); DynamicImage::ImageRgb8(rgb) - .write_to(&mut png_data, ImageFormat::PNG) + .write_to(&mut png_data, ImageFormat::Png) .unwrap(); Ok(base64::encode(&png_data)) diff --git a/components/webvr/Cargo.toml b/components/webvr/Cargo.toml index 9f713245519..ca0e209ef60 100644 --- a/components/webvr/Cargo.toml +++ b/components/webvr/Cargo.toml @@ -22,7 +22,7 @@ euclid = "0.20" ipc-channel = "0.14" log = "0.4" msg = {path = "../msg"} -rust-webvr = {version = "0.17", features = ["mock", "openvr", "vrexternal"]} +rust-webvr = {version = "0.18", features = ["mock", "openvr", "vrexternal"]} rust-webvr-api = "0.17" servo_config = {path = "../config"} sparkle = "0.1" diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index bfe5aadbd6c..afd0d9d41b6 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -52,14 +52,14 @@ backtrace = "0.3" clipboard = "0.5" euclid = "0.20" getopts = "0.2.11" -gleam = "0.6" +gleam = "0.9" glutin = "0.21.0" keyboard-types = "0.4.3" lazy_static = "1" libservo = {path = "../../components/servo"} libc = "0.2" log = "0.4" -rust-webvr = { version = "0.17", features = ["glwindow"] } +rust-webvr = { version = "0.18", features = ["glwindow"] } servo-media = {git = "https://github.com/servo/media"} shellwords = "1.0.0" tinyfiledialogs = "3.0" @@ -67,7 +67,7 @@ webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] } webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "glwindow", "headless"] } [target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies] -image = "0.22" +image = "0.23" [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies] osmesa-sys = "0.1.2" diff --git a/ports/gstplugin/Cargo.toml b/ports/gstplugin/Cargo.toml index 5718f383f33..60d3e6efdb8 100644 --- a/ports/gstplugin/Cargo.toml +++ b/ports/gstplugin/Cargo.toml @@ -17,7 +17,7 @@ path = "lib.rs" [dependencies] crossbeam-channel = "0.4" euclid = "0.20" -gleam = "0.6" +gleam = "0.9" glib = "0.9" gstreamer = "0.15" gstreamer-base = "0.15" diff --git a/ports/libmlservo/Cargo.toml b/ports/libmlservo/Cargo.toml index 9d407883103..de7bf9a6dc9 100644 --- a/ports/libmlservo/Cargo.toml +++ b/ports/libmlservo/Cargo.toml @@ -20,7 +20,7 @@ layout-2020 = ["simpleservo/layout-2020"] [dependencies] libservo = { path = "../../components/servo", features = ["no_static_freetype"] } simpleservo = { path = "../libsimpleservo/api", features = ["no_static_freetype"] } -rust-webvr = { version = "0.17", features = ["magicleap"] } +rust-webvr = { version = "0.18", features = ["magicleap"] } webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] } webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "magicleap"] } libc = "0.2" diff --git a/servo-tidy.toml b/servo-tidy.toml index 2de6bdc6a38..1a658e8429d 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -39,16 +39,12 @@ packages = [ # https://github.com/servo/servo/pull/23288#issuecomment-494687746 "gl_generator", - # Just needs a WR update. - "derive_more", - # Lots of crates to update. "smallvec", # https://github.com/servo/servo/issues/24421 "proc-macro2", "quote", - "syn", "unicode-xid", # These can be removed once servo is updated to surfman 0.2 diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-input-017.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-input-017.html.ini deleted file mode 100644 index 0f1ebae4a3e..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-input-017.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[transform-input-017.html] - expected: FAIL diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-009.xht.ini index 8f2209ffd03..3f8b74d83d8 100644 --- a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html.ini +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-009.xht.ini @@ -1,3 +1,3 @@ -[fieldset-transform-translatez.html] +[table-anonymous-objects-009.xht] expected: if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-010.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-010.xht.ini new file mode 100644 index 00000000000..631572628de --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-010.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-010.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-011.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-011.xht.ini new file mode 100644 index 00000000000..abefb55acb7 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-011.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-011.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-012.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-012.xht.ini new file mode 100644 index 00000000000..c3b40d2fc8b --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-012.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-012.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-017.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-017.xht.ini new file mode 100644 index 00000000000..3dfd592bfe4 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-017.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-017.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-018.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-018.xht.ini new file mode 100644 index 00000000000..bd9ba55b271 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-018.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-018.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-019.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-019.xht.ini new file mode 100644 index 00000000000..4edea49bb0e --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-019.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-019.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-020.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-020.xht.ini new file mode 100644 index 00000000000..154559a9888 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-020.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-020.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-115.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-115.xht.ini new file mode 100644 index 00000000000..63e7c2b2de3 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-115.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-115.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-116.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-116.xht.ini new file mode 100644 index 00000000000..94f88d1d833 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-116.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-116.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-121.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-121.xht.ini new file mode 100644 index 00000000000..27623c1fece --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-121.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-121.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-122.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-122.xht.ini new file mode 100644 index 00000000000..4bd733b58a2 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-122.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-122.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-173.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-173.xht.ini new file mode 100644 index 00000000000..7b45323fd85 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-173.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-173.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-174.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-174.xht.ini new file mode 100644 index 00000000000..fb276fe328b --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-174.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-174.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-175.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-175.xht.ini new file mode 100644 index 00000000000..15c21f32814 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-175.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-175.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-176.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-176.xht.ini new file mode 100644 index 00000000000..8d77cf2ce4b --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-176.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-176.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-197.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-197.xht.ini new file mode 100644 index 00000000000..1049a594328 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-197.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-197.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-198.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-198.xht.ini new file mode 100644 index 00000000000..df17ada3ad0 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-198.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-198.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-199.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-199.xht.ini new file mode 100644 index 00000000000..9bddaf38f67 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-199.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-199.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-200.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-200.xht.ini new file mode 100644 index 00000000000..afd3ab3a046 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-200.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-200.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-201.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-201.xht.ini new file mode 100644 index 00000000000..26065b07cb0 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-201.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-201.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-202.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-202.xht.ini new file mode 100644 index 00000000000..360381f81b9 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-202.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-202.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-203.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-203.xht.ini new file mode 100644 index 00000000000..e79a80d710b --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-203.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-203.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-204.xht.ini b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-204.xht.ini new file mode 100644 index 00000000000..8c024774a94 --- /dev/null +++ b/tests/wpt/metadata/css/CSS2/tables/table-anonymous-objects-204.xht.ini @@ -0,0 +1,3 @@ +[table-anonymous-objects-204.xht] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini index db1a30234d6..c66c3bf2773 100644 --- a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini +++ b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini @@ -1,2 +1,3 @@ [mix-blend-mode-both-parent-and-blended-with-3D-transform.html] - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html.ini deleted file mode 100644 index 3260cfddf6f..00000000000 --- a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[mix-blend-mode-parent-with-3D-transform.html] - expected: FAIL diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-text.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-text.html.ini new file mode 100644 index 00000000000..89ffd68a401 --- /dev/null +++ b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-text.html.ini @@ -0,0 +1,3 @@ +[mix-blend-mode-parent-with-text.html] + expected: + if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-with-transform-and-preserve-3D.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-with-transform-and-preserve-3D.html.ini deleted file mode 100644 index 9d6fd3d301d..00000000000 --- a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-with-transform-and-preserve-3D.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[mix-blend-mode-with-transform-and-preserve-3D.html] - expected: - if os == "linux": FAIL diff --git a/tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini index 49cfd2463e1..458137c2908 100644 --- a/tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini +++ b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini @@ -1,3 +1,3 @@ [geometry-border-image-001.https.html] - type: reftest bug: https://github.com/servo/servo/issues/17861 + expected: FAIL diff --git a/tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini index 6bb0af941cf..2e84bc8e22f 100644 --- a/tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini +++ b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini @@ -1,3 +1,3 @@ [geometry-border-image-004.https.html] - type: reftest bug: https://github.com/servo/servo/issues/17860 + expected: FAIL diff --git a/tests/wpt/metadata/css/css-transforms/transform-input-007.html.ini b/tests/wpt/metadata/css/css-transforms/transform-input-007.html.ini index 29f0f3467db..7e7a446aca0 100644 --- a/tests/wpt/metadata/css/css-transforms/transform-input-007.html.ini +++ b/tests/wpt/metadata/css/css-transforms/transform-input-007.html.ini @@ -1,5 +1,3 @@ [transform-input-007.html] - type: reftest bug: https://github.com/servo/servo/issues/21092 - expected: - if os == "linux": FAIL + expected: FAIL diff --git a/tests/wpt/metadata/css/css-transforms/transform-input-009.html.ini b/tests/wpt/metadata/css/css-transforms/transform-input-009.html.ini index 4632b24282b..51a18a634fd 100644 --- a/tests/wpt/metadata/css/css-transforms/transform-input-009.html.ini +++ b/tests/wpt/metadata/css/css-transforms/transform-input-009.html.ini @@ -1,5 +1,3 @@ [transform-input-009.html] - type: reftest bug: https://github.com/servo/servo/issues/21092 - expected: - if os == "linux": FAIL + expected: FAIL diff --git a/tests/wpt/metadata/css/css-transforms/transform-input-010.html.ini b/tests/wpt/metadata/css/css-transforms/transform-input-010.html.ini index e2f9cca83b1..3f198420c64 100644 --- a/tests/wpt/metadata/css/css-transforms/transform-input-010.html.ini +++ b/tests/wpt/metadata/css/css-transforms/transform-input-010.html.ini @@ -1,5 +1,3 @@ [transform-input-010.html] - type: reftest bug: https://github.com/servo/servo/issues/21092 - expected: - if os == "linux": FAIL + expected: FAIL diff --git a/tests/wpt/metadata/css/css-transforms/transform-input-012.html.ini b/tests/wpt/metadata/css/css-transforms/transform-input-012.html.ini index b8b83d8691e..ed9389b2c24 100644 --- a/tests/wpt/metadata/css/css-transforms/transform-input-012.html.ini +++ b/tests/wpt/metadata/css/css-transforms/transform-input-012.html.ini @@ -1,4 +1,4 @@ [transform-input-012.html] - type: reftest bug: https://github.com/servo/servo/issues/21092 - expected: FAIL + expected: + if os == "linux": FAIL diff --git a/tests/wpt/mozilla/meta-layout-2020/css/pixel_snapping_glyphs.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/pixel_snapping_glyphs.html.ini deleted file mode 100644 index 2875a4c8b45..00000000000 --- a/tests/wpt/mozilla/meta-layout-2020/css/pixel_snapping_glyphs.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[pixel_snapping_glyphs.html] - expected: FAIL |