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

Consider serializing shorthands based on previously-serialized longhands.

Browse source
This commit is contained in:
Josh Matthews 2017-09-01 15:06:08 -07:00
parent 191201de6c
commit 5b83beaceb
2 changed files with 54 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/style/properties/declaration_block.rs
View file

@ -657,10 +657,6 @@ impl ToCss for PropertyDeclarationBlock {
if is_system_font { if is_system_font {
for (longhand, importance) in self.declaration_importance_iter() { for (longhand, importance) in self.declaration_importance_iter() {
if already_serialized.contains(longhand.id()) {
continue;
}
if longhand.get_system().is_some() || longhand.is_default_line_height() { if longhand.get_system().is_some() || longhand.is_default_line_height() {
current_longhands.push(longhand); current_longhands.push(longhand);
if found_system.is_none() { if found_system.is_none() {
@ -673,10 +669,6 @@ impl ToCss for PropertyDeclarationBlock {
} }
} else { } else {
for (longhand, importance) in self.declaration_importance_iter() { for (longhand, importance) in self.declaration_importance_iter() {
if already_serialized.contains(longhand.id()) {
continue;
}
if longhand.id().is_longhand_of(shorthand) { if longhand.id().is_longhand_of(shorthand) {
current_longhands.push(longhand); current_longhands.push(longhand);
if importance.important() { if importance.important() {
@ -771,6 +763,13 @@ impl ToCss for PropertyDeclarationBlock {
// Substep 9 // Substep 9
already_serialized.insert(current_longhand.id()); already_serialized.insert(current_longhand.id());
} }
// FIXME(https://github.com/w3c/csswg-drafts/issues/1774)
// The specification does not include an instruction to abort
// the shorthand loop at this point, but doing so both matches
// Gecko and makes sense since shorthands are checked in
// preferred order.
break;
} }
} }

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

@ -341,6 +341,53 @@ mod shorthand_serialization {
mod border_shorthands { mod border_shorthands {
use super::*; use super::*;
#[test]
fn border_top_and_color() {
let mut properties = Vec::new();
properties.push(PropertyDeclaration::BorderTopWidth(BorderSideWidth::Length(Length::from_px(1.))));
properties.push(PropertyDeclaration::BorderTopStyle(BorderStyle::solid));
let c = Color::Numeric {
parsed: RGBA::new(255, 0, 0, 255),
authored: Some("green".to_string().into_boxed_str())
};
properties.push(PropertyDeclaration::BorderTopColor(c));
let c = Color::Numeric {
parsed: RGBA::new(0, 255, 0, 255),
authored: Some("red".to_string().into_boxed_str())
};
properties.push(PropertyDeclaration::BorderTopColor(c.clone()));
properties.push(PropertyDeclaration::BorderBottomColor(c.clone()));
properties.push(PropertyDeclaration::BorderLeftColor(c.clone()));
properties.push(PropertyDeclaration::BorderRightColor(c.clone()));
let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "border-top: 1px solid red; border-color: red;");
}
#[test]
fn border_color_and_top() {
let mut properties = Vec::new();
let c = Color::Numeric {
parsed: RGBA::new(0, 255, 0, 255),
authored: Some("red".to_string().into_boxed_str())
};
properties.push(PropertyDeclaration::BorderTopColor(c.clone()));
properties.push(PropertyDeclaration::BorderBottomColor(c.clone()));
properties.push(PropertyDeclaration::BorderLeftColor(c.clone()));
properties.push(PropertyDeclaration::BorderRightColor(c.clone()));
properties.push(PropertyDeclaration::BorderTopWidth(BorderSideWidth::Length(Length::from_px(1.))));
properties.push(PropertyDeclaration::BorderTopStyle(BorderStyle::solid));
let c = Color::Numeric {
parsed: RGBA::new(255, 0, 0, 255),
authored: Some("green".to_string().into_boxed_str())
};
properties.push(PropertyDeclaration::BorderTopColor(c));
let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "border-color: green red red; border-top: 1px solid green;");
}
// we can use border-top as a base to test out the different combinations // we can use border-top as a base to test out the different combinations
// but afterwards, we only need to to one test per "directional border shorthand" // but afterwards, we only need to to one test per "directional border shorthand"