Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't serialize shorthand when some but not all of its longhands are CSS-wide keyword

Browse source 
Shorthand cannot represent CSS-wide keyword in individual longhands, and
thus we cannot serialize longhand with CSS-wide keyword as part of a
shorthand.
This commit is contained in:
Xidorn Quan 2017-03-01 11:20:40 +11:00
parent 03f6d21cb5
commit 2cc6593fa1
2 changed files with 76 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

63
components/style/properties/properties.mako.rs
View file

@ -390,13 +390,19 @@ pub enum CSSWideKeyword {
Unset, Unset,
} }
impl ToCss for CSSWideKeyword { impl CSSWideKeyword {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_str(&self) -> &'static str {
dest.write_str(match *self { match *self {
CSSWideKeyword::Initial => "initial", CSSWideKeyword::Initial => "initial",
CSSWideKeyword::Inherit => "inherit", CSSWideKeyword::Inherit => "inherit",
CSSWideKeyword::Unset => "unset", CSSWideKeyword::Unset => "unset",
}) }
}
}
impl ToCss for CSSWideKeyword {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
dest.write_str(self.to_str())
} }
} }
@ -545,7 +551,16 @@ impl ShorthandId {
return None; return None;
} }
if !declarations3.any(|d| d.with_variables()) { // Check whether they are all the same CSS-wide keyword.
if let Some(keyword) = first_declaration.get_css_wide_keyword() {
if declarations2.all(|d| d.get_css_wide_keyword() == Some(keyword)) {
return Some(AppendableValue::Css(keyword.to_str()));
}
return None;
}
// Check whether all declarations can be serialized as part of shorthand.
if declarations3.all(|d| d.may_serialize_as_part_of_shorthand()) {
return Some(AppendableValue::DeclarationsForShorthand(self, declarations)); return Some(AppendableValue::DeclarationsForShorthand(self, declarations));
} }
@ -927,23 +942,47 @@ impl PropertyDeclaration {
} }
} }
/// Return whether this is a pending-substitution value. /// Returns a CSS-wide keyword if the declaration's value is one.
/// https://drafts.csswg.org/css-variables/#variables-in-shorthands pub fn get_css_wide_keyword(&self) -> Option<CSSWideKeyword> {
pub fn with_variables(&self) -> bool {
match *self { match *self {
% for property in data.longhands: % for property in data.longhands:
PropertyDeclaration::${property.camel_case}(ref value) => match *value { PropertyDeclaration::${property.camel_case}(ref value) => match *value {
DeclaredValue::WithVariables(_) => true, DeclaredValue::CSSWideKeyword(keyword) => Some(keyword),
_ => false, _ => None,
}, },
% endfor % endfor
PropertyDeclaration::Custom(_, ref value) => match *value { PropertyDeclaration::Custom(_, ref value) => match *value {
DeclaredValue::WithVariables(_) => true, DeclaredValue::CSSWideKeyword(keyword) => Some(keyword),
_ => false, _ => None,
} }
} }
} }
/// Returns whether the declaration may be serialized as part of a shorthand.
///
/// This method returns false if this declaration contains variable or has a
/// CSS-wide keyword value, since these values cannot be serialized as part
/// of a shorthand.
///
/// Caller should check `with_variables_from_shorthand()` and whether all
/// needed declarations has the same CSS-wide keyword first.
///
/// Note that, serialization of a shorthand may still fail because of other
/// property-specific requirement even when this method returns true for all
/// the longhand declarations.
pub fn may_serialize_as_part_of_shorthand(&self) -> bool {
match *self {
% for property in data.longhands:
PropertyDeclaration::${property.camel_case}(ref value) => match *value {
DeclaredValue::Value(_) => true,
_ => false,
},
% endfor
PropertyDeclaration::Custom(..) =>
unreachable!("Serialize a custom property as part of shorthand?"),
}
}
/// Return whether the value is stored as it was in the CSS source, /// Return whether the value is stored as it was in the CSS source,
/// preserving whitespace (as opposed to being parsed into a more abstract /// preserving whitespace (as opposed to being parsed into a more abstract
/// data structure). /// data structure).

142
tests/unit/style/properties/serialization.rs
View file

@ -7,7 +7,7 @@ use media_queries::CSSErrorReporterTest;
use servo_url::ServoUrl; use servo_url::ServoUrl;
use style::computed_values::display::T::inline_block; use style::computed_values::display::T::inline_block;
use style::parser::ParserContext; use style::parser::ParserContext;
use style::properties::{CSSWideKeyword, DeclaredValue, PropertyDeclaration}; use style::properties::{DeclaredValue, PropertyDeclaration};
use style::properties::{PropertyDeclarationBlock, Importance, PropertyId}; use style::properties::{PropertyDeclarationBlock, Importance, PropertyId};
use style::properties::longhands::outline_color::computed_value::T as ComputedColor; use style::properties::longhands::outline_color::computed_value::T as ComputedColor;
use style::properties::parse_property_declaration_list; use style::properties::parse_property_declaration_list;
@ -372,33 +372,18 @@ mod shorthand_serialization {
assert_eq!(serialization, "border-top: 4px solid rgb(255, 0, 0);"); assert_eq!(serialization, "border-top: 4px solid rgb(255, 0, 0);");
} }
#[test] fn get_border_property_values() -> (DeclaredValue<BorderWidth>,
fn directional_border_with_no_specified_style_will_show_style_as_none() { DeclaredValue<BorderStyle>,
let mut properties = Vec::new(); DeclaredValue<CSSColor>) {
(DeclaredValue::Value(BorderWidth::from_length(Length::from_px(4f32))),
let width = DeclaredValue::Value(BorderWidth::from_length(Length::from_px(4f32))); DeclaredValue::Value(BorderStyle::solid),
let style = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial); DeclaredValue::Value(CSSColor::currentcolor()))
let color = DeclaredValue::Value(CSSColor {
parsed: ComputedColor::RGBA(RGBA::new(255, 0, 0, 255)),
authored: None
});
properties.push(PropertyDeclaration::BorderTopWidth(width));
properties.push(PropertyDeclaration::BorderTopStyle(style));
properties.push(PropertyDeclaration::BorderTopColor(color));
let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "border-top: 4px none rgb(255, 0, 0);");
} }
#[test] #[test]
fn directional_border_with_no_specified_color_will_not_show_color() { fn border_top_should_serialize_correctly() {
let mut properties = Vec::new(); let mut properties = Vec::new();
let (width, style, color) = get_border_property_values();
let width = DeclaredValue::Value(BorderWidth::from_length(Length::from_px(4f32)));
let style = DeclaredValue::Value(BorderStyle::solid);
let color = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial);
properties.push(PropertyDeclaration::BorderTopWidth(width)); properties.push(PropertyDeclaration::BorderTopWidth(width));
properties.push(PropertyDeclaration::BorderTopStyle(style)); properties.push(PropertyDeclaration::BorderTopStyle(style));
properties.push(PropertyDeclaration::BorderTopColor(color)); properties.push(PropertyDeclaration::BorderTopColor(color));
@ -410,11 +395,7 @@ mod shorthand_serialization {
#[test] #[test]
fn border_right_should_serialize_correctly() { fn border_right_should_serialize_correctly() {
let mut properties = Vec::new(); let mut properties = Vec::new();
let (width, style, color) = get_border_property_values();
let width = DeclaredValue::Value(BorderWidth::from_length(Length::from_px(4f32)));
let style = DeclaredValue::Value(BorderStyle::solid);
let color = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial);
properties.push(PropertyDeclaration::BorderRightWidth(width)); properties.push(PropertyDeclaration::BorderRightWidth(width));
properties.push(PropertyDeclaration::BorderRightStyle(style)); properties.push(PropertyDeclaration::BorderRightStyle(style));
properties.push(PropertyDeclaration::BorderRightColor(color)); properties.push(PropertyDeclaration::BorderRightColor(color));
@ -426,11 +407,7 @@ mod shorthand_serialization {
#[test] #[test]
fn border_bottom_should_serialize_correctly() { fn border_bottom_should_serialize_correctly() {
let mut properties = Vec::new(); let mut properties = Vec::new();
let (width, style, color) = get_border_property_values();
let width = DeclaredValue::Value(BorderWidth::from_length(Length::from_px(4f32)));
let style = DeclaredValue::Value(BorderStyle::solid);
let color = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial);
properties.push(PropertyDeclaration::BorderBottomWidth(width)); properties.push(PropertyDeclaration::BorderBottomWidth(width));
properties.push(PropertyDeclaration::BorderBottomStyle(style)); properties.push(PropertyDeclaration::BorderBottomStyle(style));
properties.push(PropertyDeclaration::BorderBottomColor(color)); properties.push(PropertyDeclaration::BorderBottomColor(color));
@ -442,11 +419,7 @@ mod shorthand_serialization {
#[test] #[test]
fn border_left_should_serialize_correctly() { fn border_left_should_serialize_correctly() {
let mut properties = Vec::new(); let mut properties = Vec::new();
let (width, style, color) = get_border_property_values();
let width = DeclaredValue::Value(BorderWidth::from_length(Length::from_px(4f32)));
let style = DeclaredValue::Value(BorderStyle::solid);
let color = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial);
properties.push(PropertyDeclaration::BorderLeftWidth(width)); properties.push(PropertyDeclaration::BorderLeftWidth(width));
properties.push(PropertyDeclaration::BorderLeftStyle(style)); properties.push(PropertyDeclaration::BorderLeftStyle(style));
properties.push(PropertyDeclaration::BorderLeftColor(color)); properties.push(PropertyDeclaration::BorderLeftColor(color));
@ -458,38 +431,23 @@ mod shorthand_serialization {
#[test] #[test]
fn border_should_serialize_correctly() { fn border_should_serialize_correctly() {
let mut properties = Vec::new(); let mut properties = Vec::new();
let (width, style, color) = get_border_property_values();
let top_width = DeclaredValue::Value(BorderWidth::from_length(Length::from_px(4f32))); properties.push(PropertyDeclaration::BorderTopWidth(width.clone()));
let top_style = DeclaredValue::Value(BorderStyle::solid); properties.push(PropertyDeclaration::BorderTopStyle(style.clone()));
let top_color = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial); properties.push(PropertyDeclaration::BorderTopColor(color.clone()));
properties.push(PropertyDeclaration::BorderTopWidth(top_width)); properties.push(PropertyDeclaration::BorderRightWidth(width.clone()));
properties.push(PropertyDeclaration::BorderTopStyle(top_style)); properties.push(PropertyDeclaration::BorderRightStyle(style.clone()));
properties.push(PropertyDeclaration::BorderTopColor(top_color)); properties.push(PropertyDeclaration::BorderRightColor(color.clone()));
let right_width = DeclaredValue::Value(BorderWidth::from_length(Length::from_px(4f32))); properties.push(PropertyDeclaration::BorderBottomWidth(width.clone()));
let right_style = DeclaredValue::Value(BorderStyle::solid); properties.push(PropertyDeclaration::BorderBottomStyle(style.clone()));
let right_color = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial); properties.push(PropertyDeclaration::BorderBottomColor(color.clone()));
properties.push(PropertyDeclaration::BorderRightWidth(right_width)); properties.push(PropertyDeclaration::BorderLeftWidth(width.clone()));
properties.push(PropertyDeclaration::BorderRightStyle(right_style)); properties.push(PropertyDeclaration::BorderLeftStyle(style.clone()));
properties.push(PropertyDeclaration::BorderRightColor(right_color)); properties.push(PropertyDeclaration::BorderLeftColor(color.clone()));
let bottom_width = DeclaredValue::Value(BorderWidth::from_length(Length::from_px(4f32)));
let bottom_style = DeclaredValue::Value(BorderStyle::solid);
let bottom_color = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial);
properties.push(PropertyDeclaration::BorderBottomWidth(bottom_width));
properties.push(PropertyDeclaration::BorderBottomStyle(bottom_style));
properties.push(PropertyDeclaration::BorderBottomColor(bottom_color));
let left_width = DeclaredValue::Value(BorderWidth::from_length(Length::from_px(4f32)));
let left_style = DeclaredValue::Value(BorderStyle::solid);
let left_color = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial);
properties.push(PropertyDeclaration::BorderLeftWidth(left_width));
properties.push(PropertyDeclaration::BorderLeftStyle(left_style));
properties.push(PropertyDeclaration::BorderLeftColor(left_color));
let serialization = shorthand_properties_to_string(properties); let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "border: 4px solid;"); assert_eq!(serialization, "border: 4px solid;");
@ -518,22 +476,6 @@ mod shorthand_serialization {
let serialization = shorthand_properties_to_string(properties); let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "list-style: inside url(\"http://servo/test.png\") disc;"); assert_eq!(serialization, "list-style: inside url(\"http://servo/test.png\") disc;");
} }
#[test]
fn list_style_should_show_all_properties_even_if_only_one_is_set() {
let mut properties = Vec::new();
let position = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial);
let image = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial);
let style_type = DeclaredValue::Value(ListStyleType::disc);
properties.push(PropertyDeclaration::ListStylePosition(position));
properties.push(PropertyDeclaration::ListStyleImage(image));
properties.push(PropertyDeclaration::ListStyleType(style_type));
let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "list-style: outside none disc;");
}
} }
mod outline { mod outline {
@ -560,40 +502,6 @@ mod shorthand_serialization {
assert_eq!(serialization, "outline: 4px solid rgb(255, 0, 0);"); assert_eq!(serialization, "outline: 4px solid rgb(255, 0, 0);");
} }
#[test]
fn outline_should_not_show_color_if_not_set() {
let mut properties = Vec::new();
let width = DeclaredValue::Value(WidthContainer(Length::from_px(4f32)));
let style = DeclaredValue::Value(Either::Second(BorderStyle::solid));
let color = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial);
properties.push(PropertyDeclaration::OutlineWidth(width));
properties.push(PropertyDeclaration::OutlineStyle(style));
properties.push(PropertyDeclaration::OutlineColor(color));
let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "outline: 4px solid;");
}
#[test]
fn outline_should_serialize_correctly_when_style_is_not_set() {
let mut properties = Vec::new();
let width = DeclaredValue::Value(WidthContainer(Length::from_px(4f32)));
let style = DeclaredValue::CSSWideKeyword(CSSWideKeyword::Initial);
let color = DeclaredValue::Value(CSSColor {
parsed: ComputedColor::RGBA(RGBA::new(255, 0, 0, 255)),
authored: None
});
properties.push(PropertyDeclaration::OutlineWidth(width));
properties.push(PropertyDeclaration::OutlineStyle(style));
properties.push(PropertyDeclaration::OutlineColor(color));
let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "outline: 4px none rgb(255, 0, 0);");
}
#[test] #[test]
fn outline_should_serialize_correctly_when_style_is_auto() { fn outline_should_serialize_correctly_when_style_is_auto() {
let mut properties = Vec::new(); let mut properties = Vec::new();