From 6fce97c65c2d1d8f59b098596aac45f64306893d Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 13 Dec 2019 00:42:18 +0100 Subject: [PATCH] Parse `background: ` --- .../properties/shorthands/background.mako.rs | 23 +++++++++++++++++++ .../box-display/block-in-inline-008.xht.ini | 2 -- .../box-display/containing-block-001.xht.ini | 2 -- .../box-display/containing-block-002.xht.ini | 2 -- .../box-display/containing-block-003.xht.ini | 2 -- .../box-display/containing-block-004.xht.ini | 2 -- .../box-display/containing-block-005.xht.ini | 2 -- .../box-display/containing-block-006.xht.ini | 2 -- .../box-display/containing-block-007.xht.ini | 2 -- .../box-display/containing-block-008.xht.ini | 2 -- .../box-display/containing-block-010.xht.ini | 2 -- .../box-display/containing-block-023.xht.ini | 2 ++ .../box-display/containing-block-026.xht.ini | 2 -- 13 files changed, 25 insertions(+), 22 deletions(-) delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-008.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-001.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-002.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-003.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-004.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-005.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-006.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-007.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-023.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-026.xht.ini diff --git a/components/style/properties/shorthands/background.mako.rs b/components/style/properties/shorthands/background.mako.rs index 011ff5cb3d8..124d4fe406c 100644 --- a/components/style/properties/shorthands/background.mako.rs +++ b/components/style/properties/shorthands/background.mako.rs @@ -193,6 +193,29 @@ } +<%helpers:shorthand name="background" + engines="servo-2020" + sub_properties="background-color" + spec="https://drafts.csswg.org/css-backgrounds/#the-background"> + use crate::values::specified::Color; + use crate::parser::Parse; + + pub fn parse_value<'i, 't>( + context: &ParserContext, + input: &mut Parser<'i, 't>, + ) -> Result> { + Ok(expanded! { + background_color: Color::parse(context, input)? + }) + } + + impl<'a> ToCss for LonghandsToSerialize<'a> { + fn to_css(&self, dest: &mut CssWriter) -> fmt::Result where W: fmt::Write { + self.background_color.to_css(dest) + } + } + + <%helpers:shorthand name="background-position" engines="gecko servo-2013" flags="SHORTHAND_IN_GETCS" diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-008.xht.ini deleted file mode 100644 index 5089f96e696..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-008.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[block-in-inline-008.xht] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-001.xht.ini deleted file mode 100644 index fe9734b830b..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-001.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[containing-block-001.xht] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-002.xht.ini deleted file mode 100644 index e2c7dd3545b..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-002.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[containing-block-002.xht] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-003.xht.ini deleted file mode 100644 index 245262f0b90..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-003.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[containing-block-003.xht] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-004.xht.ini deleted file mode 100644 index 199c0c4dd37..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-004.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[containing-block-004.xht] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-005.xht.ini deleted file mode 100644 index 612786df8b4..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-005.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[containing-block-005.xht] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-006.xht.ini deleted file mode 100644 index 0394efb0d59..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-006.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[containing-block-006.xht] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-007.xht.ini deleted file mode 100644 index 0c000bb2cd3..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-007.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[containing-block-007.xht] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini deleted file mode 100644 index dd630be0f54..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[containing-block-008.xht] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini deleted file mode 100644 index af40eef0a5d..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[containing-block-010.xht] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-023.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-023.xht.ini new file mode 100644 index 00000000000..906c33cc7ca --- /dev/null +++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-023.xht.ini @@ -0,0 +1,2 @@ +[containing-block-023.xht] + expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-026.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-026.xht.ini deleted file mode 100644 index 46f865284ca..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-026.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[containing-block-026.xht] - expected: FAIL