From 4c1c20d492cdb11161e001acdc3050715d2c6fa9 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 18 Oct 2017 07:24:46 +1000 Subject: [PATCH] Update WR (box shadows, subpixel + alpha text) --- Cargo.lock | 4 ++-- components/gfx/display_list/mod.rs | 2 -- components/layout/webrender_helpers.rs | 1 - .../css-backgrounds-3_dev/html4/css3-box-shadow.htm.ini | 5 +++++ 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 tests/wpt/metadata-css/css-backgrounds-3_dev/html4/css3-box-shadow.htm.ini diff --git a/Cargo.lock b/Cargo.lock index 889ea6b1616..6d6b18fc6c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3600,7 +3600,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.52.1" -source = "git+https://github.com/servo/webrender#5e30fb4168a22440d91066c246eb16e35eb84e91" +source = "git+https://github.com/servo/webrender#6a7b5381b21805f4e3a15cda3bbe8466bc916485" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3628,7 +3628,7 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.52.1" -source = "git+https://github.com/servo/webrender#5e30fb4168a22440d91066c246eb16e35eb84e91" +source = "git+https://github.com/servo/webrender#6a7b5381b21805f4e3a15cda3bbe8466bc916485" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index 341024b63ee..4e0f0ce54b7 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -1226,8 +1226,6 @@ pub struct DefineClipScrollNodeItem { /// How a box shadow should be clipped. #[derive(Clone, Copy, Debug, Deserialize, HeapSizeOf, PartialEq, Serialize)] pub enum BoxShadowClipMode { - /// No special clipping should occur. This is used for (shadowed) text decorations. - None, /// The area inside `box_bounds` should be clipped out. Corresponds to the normal CSS /// `box-shadow`. Outset, diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs index fbd5d423ddf..26a51764c2e 100644 --- a/components/layout/webrender_helpers.rs +++ b/components/layout/webrender_helpers.rs @@ -84,7 +84,6 @@ trait ToBoxShadowClipMode { impl ToBoxShadowClipMode for BoxShadowClipMode { fn to_clip_mode(&self) -> webrender_api::BoxShadowClipMode { match *self { - BoxShadowClipMode::None => webrender_api::BoxShadowClipMode::None, BoxShadowClipMode::Inset => webrender_api::BoxShadowClipMode::Inset, BoxShadowClipMode::Outset => webrender_api::BoxShadowClipMode::Outset, } diff --git a/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/css3-box-shadow.htm.ini b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/css3-box-shadow.htm.ini new file mode 100644 index 00000000000..5ffb919a39a --- /dev/null +++ b/tests/wpt/metadata-css/css-backgrounds-3_dev/html4/css3-box-shadow.htm.ini @@ -0,0 +1,5 @@ +[css3-box-shadow.htm] + type: reftest + expected: + if os == "linux": FAIL + bug: https://github.com/servo/webrender/issues/1776