mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Auto merge of #12572 - craftytrickster:10933/shorthands, r=emilio
10933/shorthands <!-- Please describe your changes on the following line: --> This implements the serialization of nearly all of the css shorthand properties with the following exceptions: 1. font - this may be implemented correctly, but I am not 100% sure 2. border-radius - I do not know how to implement this, since I am not familiar with how the property works 3. background - this is implemented, but I think that the implementation might be a tiny bit off. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #10933 (github issue number if applicable). Also fixes issue #11448 <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12572) <!-- Reviewable:end -->
This commit is contained in:
bors-servo
GitHub
commit
b61c45639a
25 changed files with 2102 additions and 747 deletions
|
|
@ -403,9 +403,11 @@
|
|||
%>
|
||||
% if shorthand:
|
||||
pub mod ${shorthand.ident} {
|
||||
use cssparser::Parser;
|
||||
#[allow(unused_imports)]
|
||||
use cssparser::{Parser, ToCss};
|
||||
use parser::ParserContext;
|
||||
use properties::{longhands, PropertyDeclaration, DeclaredValue, Shorthand};
|
||||
use std::fmt;
|
||||
|
||||
pub struct Longhands {
|
||||
% for sub_property in shorthand.sub_properties:
|
||||
|
|
@ -414,6 +416,55 @@
|
|||
% endfor
|
||||
}
|
||||
|
||||
/// Represents a serializable set of all of the longhand properties that correspond to a shorthand
|
||||
pub struct LonghandsToSerialize<'a> {
|
||||
% for sub_property in shorthand.sub_properties:
|
||||
pub ${sub_property.ident}: &'a DeclaredValue<longhands::${sub_property.ident}::SpecifiedValue>,
|
||||
% endfor
|
||||
}
|
||||
|
||||
impl<'a> LonghandsToSerialize<'a> {
|
||||
pub fn from_iter<I: Iterator<Item=&'a PropertyDeclaration>>(iter: I) -> Result<Self, ()> {
|
||||
// Define all of the expected variables that correspond to the shorthand
|
||||
% for sub_property in shorthand.sub_properties:
|
||||
let mut ${sub_property.ident} = None;
|
||||
% endfor
|
||||
|
||||
// Attempt to assign the incoming declarations to the expected variables
|
||||
for longhand in iter {
|
||||
match *longhand {
|
||||
% for sub_property in shorthand.sub_properties:
|
||||
PropertyDeclaration::${sub_property.camel_case}(ref value) => {
|
||||
${sub_property.ident} = Some(value)
|
||||
},
|
||||
% endfor
|
||||
_ => {}
|
||||
};
|
||||
}
|
||||
|
||||
// If any of the expected variables are missing, return an error
|
||||
match (
|
||||
% for sub_property in shorthand.sub_properties:
|
||||
${sub_property.ident},
|
||||
% endfor
|
||||
) {
|
||||
|
||||
(
|
||||
% for sub_property in shorthand.sub_properties:
|
||||
Some(${sub_property.ident}),
|
||||
% endfor
|
||||
) =>
|
||||
Ok(LonghandsToSerialize {
|
||||
% for sub_property in shorthand.sub_properties:
|
||||
${sub_property.ident}: ${sub_property.ident},
|
||||
% endfor
|
||||
}),
|
||||
_ => Err(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pub fn parse(context: &ParserContext, input: &mut Parser,
|
||||
declarations: &mut Vec<PropertyDeclaration>)
|
||||
-> Result<(), ()> {
|
||||
|
|
@ -454,11 +505,8 @@
|
|||
}
|
||||
}
|
||||
|
||||
#[allow(unused_variables)]
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
${caller.body()}
|
||||
}
|
||||
}
|
||||
% endif
|
||||
</%def>
|
||||
|
||||
|
|
@ -468,12 +516,26 @@
|
|||
for side in ['top', 'right', 'bottom', 'left'])}">
|
||||
use super::parse_four_sides;
|
||||
use values::specified;
|
||||
let _unused = context;
|
||||
|
||||
pub fn parse_value(_: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let (top, right, bottom, left) = try!(parse_four_sides(input, ${parser_function}));
|
||||
Ok(Longhands {
|
||||
% for side in ["top", "right", "bottom", "left"]:
|
||||
${to_rust_ident(sub_property_pattern % side)}: Some(${side}),
|
||||
% endfor
|
||||
})
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
super::serialize_four_sides(
|
||||
dest,
|
||||
self.${to_rust_ident(sub_property_pattern % 'top')},
|
||||
self.${to_rust_ident(sub_property_pattern % 'right')},
|
||||
self.${to_rust_ident(sub_property_pattern % 'bottom')},
|
||||
self.${to_rust_ident(sub_property_pattern % 'left')}
|
||||
)
|
||||
}
|
||||
}
|
||||
</%self:shorthand>
|
||||
</%def>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
// Please note that valid Rust syntax may be mangled by the Mako parser.
|
||||
// For example, Vec<&Foo> will be mangled as Vec&Foo>. To work around these issues, the code
|
||||
// can be escaped. In the above example, Vec<<&Foo> achieves the desired result of Vec<&Foo>.
|
||||
// can be escaped. In the above example, Vec<<&Foo> or Vec< &Foo> achieves the desired result of Vec<&Foo>.
|
||||
|
||||
<%namespace name="helpers" file="/helpers.mako.rs" />
|
||||
|
||||
|
|
@ -74,8 +74,7 @@ pub mod longhands {
|
|||
}
|
||||
|
||||
pub mod shorthands {
|
||||
use cssparser::{Parser, ToCss};
|
||||
use std::fmt;
|
||||
use cssparser::Parser;
|
||||
use parser::ParserContext;
|
||||
use values::specified;
|
||||
|
||||
|
|
@ -122,33 +121,7 @@ pub mod shorthands {
|
|||
Ok((top, right, bottom, left))
|
||||
}
|
||||
|
||||
/// Serialize a set of top,left,bottom,right values, in <margin>-shorthand style,
|
||||
/// attempting to minimize the output
|
||||
pub fn serialize_four_sides<T, W>(sides: (&T, &T, &T, &T), dest: &mut W) -> fmt::Result
|
||||
where W: fmt::Write, T: ToCss+PartialEq {
|
||||
if sides.0 == sides.1 && sides.0 == sides.2 && sides.0 == sides.3 {
|
||||
sides.0.to_css(dest)
|
||||
} else if sides.0 == sides.2 && sides.1 == sides.3 {
|
||||
try!(sides.0.to_css(dest));
|
||||
try!(dest.write_str(" "));
|
||||
sides.1.to_css(dest)
|
||||
} else if sides.1 == sides.3 {
|
||||
try!(sides.0.to_css(dest));
|
||||
try!(dest.write_str(" "));
|
||||
try!(sides.1.to_css(dest));
|
||||
try!(dest.write_str(" "));
|
||||
sides.2.to_css(dest)
|
||||
} else {
|
||||
try!(sides.0.to_css(dest));
|
||||
try!(dest.write_str(" "));
|
||||
try!(sides.1.to_css(dest));
|
||||
try!(dest.write_str(" "));
|
||||
try!(sides.2.to_css(dest));
|
||||
try!(dest.write_str(" "));
|
||||
sides.3.to_css(dest)
|
||||
}
|
||||
}
|
||||
|
||||
<%include file="/shorthand/serialize.mako.rs" />
|
||||
<%include file="/shorthand/background.mako.rs" />
|
||||
<%include file="/shorthand/border.mako.rs" />
|
||||
<%include file="/shorthand/box.mako.rs" />
|
||||
|
|
@ -435,18 +408,14 @@ impl ToCss for PropertyDeclarationBlock {
|
|||
}
|
||||
}
|
||||
|
||||
enum AppendableValue<'a, I>
|
||||
pub enum AppendableValue<'a, I>
|
||||
where I: Iterator<Item=&'a PropertyDeclaration> {
|
||||
Declaration(&'a PropertyDeclaration),
|
||||
DeclarationsForShorthand(I),
|
||||
DeclarationsForShorthand(Shorthand, I),
|
||||
Css(&'a str)
|
||||
}
|
||||
|
||||
fn append_property_name<W>(dest: &mut W,
|
||||
property_name: &str,
|
||||
is_first_serialization: &mut bool)
|
||||
-> fmt::Result where W: fmt::Write {
|
||||
|
||||
fn handle_first_serialization<W>(dest: &mut W, is_first_serialization: &mut bool) -> fmt::Result where W: fmt::Write {
|
||||
// after first serialization(key: value;) add whitespace between the pairs
|
||||
if !*is_first_serialization {
|
||||
try!(write!(dest, " "));
|
||||
|
|
@ -455,7 +424,7 @@ fn append_property_name<W>(dest: &mut W,
|
|||
*is_first_serialization = false;
|
||||
}
|
||||
|
||||
write!(dest, "{}", property_name)
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn append_declaration_value<'a, W, I>
|
||||
|
|
@ -471,15 +440,8 @@ fn append_declaration_value<'a, W, I>
|
|||
AppendableValue::Declaration(decl) => {
|
||||
try!(decl.to_css(dest));
|
||||
},
|
||||
AppendableValue::DeclarationsForShorthand(decls) => {
|
||||
let mut decls = decls.peekable();
|
||||
while let Some(decl) = decls.next() {
|
||||
try!(decl.to_css(dest));
|
||||
|
||||
if decls.peek().is_some() {
|
||||
try!(write!(dest, " "));
|
||||
}
|
||||
}
|
||||
AppendableValue::DeclarationsForShorthand(shorthand, decls) => {
|
||||
try!(shorthand.longhands_to_css(decls, dest));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -498,8 +460,15 @@ fn append_serialization<'a, W, I>(dest: &mut W,
|
|||
-> fmt::Result
|
||||
where W: fmt::Write, I: Iterator<Item=&'a PropertyDeclaration> {
|
||||
|
||||
try!(append_property_name(dest, property_name, is_first_serialization));
|
||||
try!(write!(dest, ":"));
|
||||
try!(handle_first_serialization(dest, is_first_serialization));
|
||||
|
||||
// Overflow does not behave like a normal shorthand. When overflow-x and overflow-y are not of equal
|
||||
// values, they no longer use the shared property name "overflow" and must be handled differently
|
||||
if shorthands::is_overflow_shorthand(&appendable_value) {
|
||||
return append_declaration_value(dest, appendable_value, is_important);
|
||||
}
|
||||
|
||||
write!(dest, "{}:", property_name);
|
||||
|
||||
// for normal parsed values, add a space between key: and value
|
||||
match &appendable_value {
|
||||
|
|
@ -512,7 +481,7 @@ fn append_serialization<'a, W, I>(dest: &mut W,
|
|||
try!(write!(dest, " "));
|
||||
}
|
||||
},
|
||||
&AppendableValue::DeclarationsForShorthand(_) => try!(write!(dest, " "))
|
||||
&AppendableValue::DeclarationsForShorthand(..) => try!(write!(dest, " "))
|
||||
}
|
||||
|
||||
try!(append_declaration_value(dest, appendable_value, is_important));
|
||||
|
|
@ -691,6 +660,20 @@ impl Shorthand {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn longhands_to_css<'a, W, I>(&self, declarations: I, dest: &mut W) -> fmt::Result
|
||||
where W: fmt::Write, I: Iterator<Item=&'a PropertyDeclaration> {
|
||||
match *self {
|
||||
% for property in data.shorthands:
|
||||
Shorthand::${property.camel_case} => {
|
||||
match shorthands::${property.ident}::LonghandsToSerialize::from_iter(declarations) {
|
||||
Ok(longhands) => longhands.to_css(dest),
|
||||
Err(_) => Err(fmt::Error)
|
||||
}
|
||||
},
|
||||
% endfor
|
||||
}
|
||||
}
|
||||
|
||||
/// Serializes possible shorthand value to String.
|
||||
pub fn serialize_shorthand_value_to_string<'a, I>(self, declarations: I, is_important: bool) -> String
|
||||
where I: Iterator<Item=&'a PropertyDeclaration> + Clone {
|
||||
|
|
@ -747,10 +730,7 @@ impl Shorthand {
|
|||
}
|
||||
|
||||
if !declarations3.any(|d| d.with_variables()) {
|
||||
return Some(AppendableValue::DeclarationsForShorthand(declarations));
|
||||
// FIXME: this needs property-specific code, which probably should be in style/
|
||||
// "as appropriate according to the grammar of shorthand "
|
||||
// https://drafts.csswg.org/cssom/#serialize-a-css-value
|
||||
return Some(AppendableValue::DeclarationsForShorthand(self, declarations));
|
||||
}
|
||||
|
||||
None
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
use properties::longhands::{background_color, background_position, background_repeat, background_attachment};
|
||||
use properties::longhands::{background_image, background_size, background_origin, background_clip};
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let mut color = None;
|
||||
let mut image = None;
|
||||
let mut position = None;
|
||||
|
|
@ -95,5 +96,91 @@
|
|||
} else {
|
||||
Err(())
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
match *self.background_color {
|
||||
DeclaredValue::Value(ref color) => {
|
||||
try!(color.to_css(dest));
|
||||
},
|
||||
_ => {
|
||||
try!(write!(dest, "transparent"));
|
||||
}
|
||||
};
|
||||
|
||||
try!(write!(dest, " "));
|
||||
|
||||
match *self.background_image {
|
||||
DeclaredValue::Value(ref image) => {
|
||||
try!(image.to_css(dest));
|
||||
},
|
||||
_ => {
|
||||
try!(write!(dest, "none"));
|
||||
}
|
||||
};
|
||||
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.background_repeat.to_css(dest));
|
||||
|
||||
try!(write!(dest, " "));
|
||||
|
||||
match *self.background_attachment {
|
||||
DeclaredValue::Value(ref attachment) => {
|
||||
try!(attachment.to_css(dest));
|
||||
},
|
||||
_ => {
|
||||
try!(write!(dest, "scroll"));
|
||||
}
|
||||
};
|
||||
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.background_position.to_css(dest));
|
||||
|
||||
if let DeclaredValue::Value(ref size) = *self.background_size {
|
||||
try!(write!(dest, " / "));
|
||||
try!(size.to_css(dest));
|
||||
}
|
||||
|
||||
match (self.background_origin, self.background_clip) {
|
||||
(&DeclaredValue::Value(ref origin), &DeclaredValue::Value(ref clip)) => {
|
||||
use properties::longhands::background_origin::computed_value::T as Origin;
|
||||
use properties::longhands::background_clip::computed_value::T as Clip;
|
||||
|
||||
try!(write!(dest, " "));
|
||||
|
||||
match (origin, clip) {
|
||||
(&Origin::padding_box, &Clip::padding_box) => {
|
||||
try!(origin.to_css(dest));
|
||||
},
|
||||
(&Origin::border_box, &Clip::border_box) => {
|
||||
try!(origin.to_css(dest));
|
||||
},
|
||||
(&Origin::content_box, &Clip::content_box) => {
|
||||
try!(origin.to_css(dest));
|
||||
},
|
||||
_ => {
|
||||
try!(origin.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
try!(clip.to_css(dest));
|
||||
}
|
||||
}
|
||||
},
|
||||
(&DeclaredValue::Value(ref origin), _) => {
|
||||
try!(write!(dest, " "));
|
||||
try!(origin.to_css(dest));
|
||||
},
|
||||
(_, &DeclaredValue::Value(ref clip)) => {
|
||||
try!(write!(dest, " "));
|
||||
try!(clip.to_css(dest));
|
||||
},
|
||||
_ => {}
|
||||
};
|
||||
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ ${helpers.four_sides_shorthand("border-style", "border-%s-style",
|
|||
for side in ['top', 'right', 'bottom', 'left'])}">
|
||||
use super::parse_four_sides;
|
||||
use values::specified;
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let _unused = context;
|
||||
let (top, right, bottom, left) = try!(parse_four_sides(input, specified::parse_border_width));
|
||||
Ok(Longhands {
|
||||
|
|
@ -21,6 +23,29 @@ ${helpers.four_sides_shorthand("border-style", "border-%s-style",
|
|||
Some(longhands::${to_rust_ident('border-%s-width' % side)}::SpecifiedValue(${side})),
|
||||
% endfor
|
||||
})
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
// extract tuple container values so that the different border widths
|
||||
// can be compared via partial eq
|
||||
% for side in ["top", "right", "bottom", "left"]:
|
||||
let ${side} = match self.border_${side}_width {
|
||||
&DeclaredValue::Value(ref value) => DeclaredValue::Value(value.0),
|
||||
&DeclaredValue::WithVariables {
|
||||
css: ref a, first_token_type: ref b, base_url: ref c, from_shorthand: ref d
|
||||
} => DeclaredValue::WithVariables {
|
||||
// WithVariables should not be reachable during serialization
|
||||
css: a.clone(), first_token_type: b.clone(), base_url: c.clone(), from_shorthand: d.clone()
|
||||
},
|
||||
&DeclaredValue::Initial => DeclaredValue::Initial,
|
||||
&DeclaredValue::Inherit => DeclaredValue::Inherit,
|
||||
};
|
||||
% endfor
|
||||
|
||||
super::serialize_four_sides(dest, &top, &right, &bottom, &left)
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
||||
|
||||
|
|
@ -61,12 +86,13 @@ pub fn parse_border(context: &ParserContext, input: &mut Parser)
|
|||
if any { Ok((color, style, width)) } else { Err(()) }
|
||||
}
|
||||
|
||||
|
||||
% for side in ["top", "right", "bottom", "left"]:
|
||||
<%helpers:shorthand name="border-${side}" sub_properties="${' '.join(
|
||||
'border-%s-%s' % (side, prop)
|
||||
for prop in ['color', 'style', 'width']
|
||||
)}">
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let (color, style, width) = try!(super::parse_border(context, input));
|
||||
Ok(Longhands {
|
||||
border_${side}_color: color,
|
||||
|
|
@ -74,6 +100,19 @@ pub fn parse_border(context: &ParserContext, input: &mut Parser)
|
|||
border_${side}_width:
|
||||
width.map(longhands::${to_rust_ident('border-%s-width' % side)}::SpecifiedValue),
|
||||
})
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
super::serialize_directional_border(
|
||||
dest,
|
||||
self.border_${side}_width,
|
||||
self.border_${side}_style,
|
||||
self.border_${side}_color
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
</%helpers:shorthand>
|
||||
% endfor
|
||||
|
||||
|
|
@ -82,6 +121,8 @@ pub fn parse_border(context: &ParserContext, input: &mut Parser)
|
|||
for side in ['top', 'right', 'bottom', 'left']
|
||||
for prop in ['color', 'style', 'width']
|
||||
)}">
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let (color, style, width) = try!(super::parse_border(context, input));
|
||||
Ok(Longhands {
|
||||
% for side in ["top", "right", "bottom", "left"]:
|
||||
|
|
@ -91,6 +132,21 @@ pub fn parse_border(context: &ParserContext, input: &mut Parser)
|
|||
width.map(longhands::${to_rust_ident('border-%s-width' % side)}::SpecifiedValue),
|
||||
% endfor
|
||||
})
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
// If all longhands are all present, then all sides should be the same,
|
||||
// so we can just one set of color/style/width
|
||||
super::serialize_directional_border(
|
||||
dest,
|
||||
self.border_${side}_width,
|
||||
self.border_${side}_style,
|
||||
self.border_${side}_color
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
</%helpers:shorthand>
|
||||
|
||||
<%helpers:shorthand name="border-radius" sub_properties="${' '.join(
|
||||
|
|
@ -99,6 +155,7 @@ pub fn parse_border(context: &ParserContext, input: &mut Parser)
|
|||
)}">
|
||||
use values::specified::basic_shape::BorderRadius;
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let _ignored = context;
|
||||
|
||||
let radii = try!(BorderRadius::parse(input));
|
||||
|
|
@ -108,4 +165,23 @@ pub fn parse_border(context: &ParserContext, input: &mut Parser)
|
|||
border_bottom_right_radius: Some(radii.bottom_right),
|
||||
border_bottom_left_radius: Some(radii.bottom_left),
|
||||
})
|
||||
}
|
||||
|
||||
// TODO: I do not understand how border radius works with respect to the slashes /,
|
||||
// so putting a default generic impl for now
|
||||
// https://developer.mozilla.org/en-US/docs/Web/CSS/border-radius
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
try!(self.border_top_left_radius.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.border_top_right_radius.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.border_bottom_right_radius.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
self.border_bottom_left_radius.to_css(dest)
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,47 @@
|
|||
<%helpers:shorthand name="overflow" sub_properties="overflow-x overflow-y">
|
||||
use properties::longhands::{overflow_x, overflow_y};
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let overflow = try!(overflow_x::parse(context, input));
|
||||
Ok(Longhands {
|
||||
overflow_x: Some(overflow),
|
||||
overflow_y: Some(overflow_y::SpecifiedValue(overflow)),
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// Overflow does not behave like a normal shorthand. When overflow-x and overflow-y are not of equal
|
||||
// values, they no longer use the shared property name "overflow".
|
||||
// Other shorthands do not include their name in the to_css method
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
let x_and_y_equal = match (self.overflow_x, self.overflow_y) {
|
||||
(&DeclaredValue::Value(ref x_value), &DeclaredValue::Value(ref y_container)) => {
|
||||
*x_value == y_container.0
|
||||
},
|
||||
(&DeclaredValue::WithVariables { .. }, &DeclaredValue::WithVariables { .. }) => true,
|
||||
(&DeclaredValue::Initial, &DeclaredValue::Initial) => true,
|
||||
(&DeclaredValue::Inherit, &DeclaredValue::Inherit) => true,
|
||||
_ => false
|
||||
};
|
||||
|
||||
if x_and_y_equal {
|
||||
try!(write!(dest, "overflow"));
|
||||
try!(write!(dest, ": "));
|
||||
try!(self.overflow_x.to_css(dest));
|
||||
} else {
|
||||
try!(write!(dest, "overflow-x"));
|
||||
try!(write!(dest, ": "));
|
||||
try!(self.overflow_x.to_css(dest));
|
||||
try!(write!(dest, "; "));
|
||||
|
||||
try!(write!(dest, "overflow-y: "));
|
||||
try!(self.overflow_y.to_css(dest));
|
||||
}
|
||||
|
||||
write!(dest, ";")
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
||||
macro_rules! try_parse_one {
|
||||
|
|
@ -32,6 +68,7 @@ macro_rules! try_parse_one {
|
|||
use properties::longhands::{transition_delay, transition_duration, transition_property};
|
||||
use properties::longhands::{transition_timing_function};
|
||||
|
||||
pub fn parse_value(_: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
struct SingleTransition {
|
||||
transition_property: transition_property::SingleSpecifiedValue,
|
||||
transition_duration: transition_duration::SingleSpecifiedValue,
|
||||
|
|
@ -93,6 +130,22 @@ macro_rules! try_parse_one {
|
|||
Some(transition_timing_function::SpecifiedValue(timing_functions)),
|
||||
transition_delay: Some(transition_delay::SpecifiedValue(delays)),
|
||||
})
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
try!(self.transition_property.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.transition_duration.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.transition_timing_function.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
self.transition_delay.to_css(dest)
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
||||
<%helpers:shorthand name="animation"
|
||||
|
|
@ -104,6 +157,7 @@ macro_rules! try_parse_one {
|
|||
use properties::longhands::{animation_delay, animation_iteration_count, animation_direction};
|
||||
use properties::longhands::{animation_fill_mode, animation_play_state};
|
||||
|
||||
pub fn parse_value(_: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
struct SingleAnimation {
|
||||
animation_name: animation_name::SingleSpecifiedValue,
|
||||
animation_duration: animation_duration::SingleSpecifiedValue,
|
||||
|
|
@ -211,4 +265,34 @@ macro_rules! try_parse_one {
|
|||
animation_fill_mode: Some(animation_fill_mode::SpecifiedValue(fill_modes)),
|
||||
animation_play_state: Some(animation_play_state::SpecifiedValue(play_states)),
|
||||
})
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
try!(self.animation_duration.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
// FIXME: timing function is displaying the actual mathematical name "cubic-bezier(0.25, 0.1, 0.25, 1)"
|
||||
// instead of the common name "ease"
|
||||
try!(self.animation_timing_function.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.animation_delay.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.animation_direction.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.animation_fill_mode.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.animation_iteration_count.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.animation_play_state.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
self.animation_name.to_css(dest)
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,9 @@
|
|||
|
||||
<%helpers:shorthand name="columns" sub_properties="column-count column-width" experimental="True">
|
||||
use properties::longhands::{column_count, column_width};
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
|
||||
let mut column_count = None;
|
||||
let mut column_width = None;
|
||||
let mut autos = 0;
|
||||
|
|
@ -43,4 +46,14 @@
|
|||
column_width: column_width,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
try!(self.column_width.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
self.column_count.to_css(dest)
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@
|
|||
font-size line-height font-family">
|
||||
use properties::longhands::{font_style, font_variant, font_weight, font_size,
|
||||
line_height, font_family};
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let mut nb_normals = 0;
|
||||
let mut style = None;
|
||||
let mut variant = None;
|
||||
|
|
@ -63,4 +65,40 @@
|
|||
line_height: line_height,
|
||||
font_family: Some(font_family::SpecifiedValue(family))
|
||||
})
|
||||
}
|
||||
|
||||
// This may be a bit off, unsure, possibly needs changes
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
if let DeclaredValue::Value(ref style) = *self.font_style {
|
||||
try!(style.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
}
|
||||
|
||||
if let DeclaredValue::Value(ref variant) = *self.font_variant {
|
||||
try!(variant.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
}
|
||||
|
||||
if let DeclaredValue::Value(ref weight) = *self.font_weight {
|
||||
try!(weight.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
}
|
||||
|
||||
try!(self.font_size.to_css(dest));
|
||||
if let DeclaredValue::Value(ref height) = *self.line_height {
|
||||
match *height {
|
||||
line_height::SpecifiedValue::Normal => {},
|
||||
_ => {
|
||||
try!(write!(dest, "/"));
|
||||
try!(height.to_css(dest));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try!(write!(dest, " "));
|
||||
|
||||
self.font_family.to_css(dest)
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,16 @@
|
|||
// the `overflow-wrap` property, as if it were a shorthand of `overflow-wrap`."
|
||||
<%helpers:shorthand name="word-wrap" sub_properties="overflow-wrap">
|
||||
use properties::longhands::overflow_wrap;
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
Ok(Longhands {
|
||||
overflow_wrap: Some(try!(overflow_wrap::parse(context, input))),
|
||||
})
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
self.overflow_wrap.to_css(dest)
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
sub_properties="list-style-image list-style-position list-style-type">
|
||||
use properties::longhands::{list_style_image, list_style_position, list_style_type};
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
// `none` is ambiguous until we've finished parsing the shorthands, so we count the number
|
||||
// of times we see it.
|
||||
let mut nones = 0u8;
|
||||
|
|
@ -89,4 +90,28 @@
|
|||
}
|
||||
_ => Err(()),
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
match *self.list_style_position {
|
||||
DeclaredValue::Initial => try!(write!(dest, "outside")),
|
||||
_ => try!(self.list_style_position.to_css(dest))
|
||||
}
|
||||
|
||||
try!(write!(dest, " "));
|
||||
|
||||
match *self.list_style_image {
|
||||
DeclaredValue::Initial => try!(write!(dest, "none")),
|
||||
_ => try!(self.list_style_image.to_css(dest))
|
||||
};
|
||||
|
||||
try!(write!(dest, " "));
|
||||
|
||||
match *self.list_style_type {
|
||||
DeclaredValue::Initial => write!(dest, "disc"),
|
||||
_ => self.list_style_type.to_css(dest)
|
||||
}
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
use properties::longhands::outline_width;
|
||||
use values::specified;
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let _unused = context;
|
||||
let mut color = None;
|
||||
let mut style = None;
|
||||
|
|
@ -46,6 +47,27 @@
|
|||
} else {
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
try!(self.outline_width.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
match *self.outline_style {
|
||||
DeclaredValue::Initial => try!(write!(dest, "none")),
|
||||
_ => try!(self.outline_style.to_css(dest))
|
||||
};
|
||||
|
||||
match *self.outline_color {
|
||||
DeclaredValue::Initial => Ok(()),
|
||||
_ => {
|
||||
try!(write!(dest, " "));
|
||||
self.outline_color.to_css(dest)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
||||
// The -moz-outline-radius shorthand is non-standard and not on a standards track.
|
||||
|
|
@ -55,6 +77,7 @@
|
|||
)}" products="gecko">
|
||||
use properties::shorthands;
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
// Re-use border-radius parsing.
|
||||
shorthands::border_radius::parse_value(context, input).map(|longhands| {
|
||||
Longhands {
|
||||
|
|
@ -63,4 +86,21 @@
|
|||
% endfor
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// TODO: Border radius for the radius shorthand is not implemented correctly yet
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
try!(self._moz_outline_radius_topleft.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self._moz_outline_radius_topright.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self._moz_outline_radius_bottomright.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
self._moz_outline_radius_bottomleft.to_css(dest)
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
experimental="True">
|
||||
use properties::longhands::{flex_direction, flex_wrap};
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let mut direction = None;
|
||||
let mut wrap = None;
|
||||
loop {
|
||||
|
|
@ -34,6 +35,24 @@
|
|||
flex_direction: direction,
|
||||
flex_wrap: wrap,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
match *self.flex_direction {
|
||||
DeclaredValue::Initial => try!(write!(dest, "row")),
|
||||
_ => try!(self.flex_direction.to_css(dest))
|
||||
};
|
||||
|
||||
try!(write!(dest, " "));
|
||||
|
||||
match *self.flex_wrap {
|
||||
DeclaredValue::Initial => write!(dest, "nowrap"),
|
||||
_ => self.flex_wrap.to_css(dest)
|
||||
}
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
||||
// https://drafts.csswg.org/css-flexbox/#flex-property
|
||||
|
|
@ -49,6 +68,7 @@
|
|||
Ok((grow, shrink))
|
||||
}
|
||||
|
||||
pub fn parse_value(_: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let mut grow = None;
|
||||
let mut shrink = None;
|
||||
let mut basis = None;
|
||||
|
|
@ -85,4 +105,17 @@
|
|||
flex_shrink: shrink.or(Some(Number(1.0))),
|
||||
flex_basis: basis.or(Some(LengthOrPercentageOrAutoOrContent::Length(Length::Absolute(Au(0)))))
|
||||
})
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
try!(self.flex_grow.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(self.flex_shrink.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
self.flex_basis.to_css(dest)
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
|
|
|||
97
components/style/properties/shorthand/serialize.mako.rs
Normal file
97
components/style/properties/shorthand/serialize.mako.rs
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use cssparser::ToCss;
|
||||
use properties::{AppendableValue, DeclaredValue, PropertyDeclaration, Shorthand};
|
||||
use values::specified::{BorderStyle, CSSColor};
|
||||
use std::fmt;
|
||||
|
||||
pub fn serialize_four_sides<W, I>(dest: &mut W, top: &I, right: &I, bottom: &I, left: &I)
|
||||
-> fmt::Result where W: fmt::Write, I: ToCss + PartialEq {
|
||||
|
||||
if left == right {
|
||||
let horizontal_value = left;
|
||||
|
||||
if top == bottom {
|
||||
let vertical_value = top;
|
||||
|
||||
if horizontal_value == vertical_value {
|
||||
let single_value = horizontal_value;
|
||||
try!(single_value.to_css(dest));
|
||||
} else {
|
||||
try!(vertical_value.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(horizontal_value.to_css(dest));
|
||||
}
|
||||
} else {
|
||||
try!(top.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(horizontal_value.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(bottom.to_css(dest));
|
||||
}
|
||||
} else {
|
||||
try!(top.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(right.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(bottom.to_css(dest));
|
||||
try!(write!(dest, " "));
|
||||
|
||||
try!(left.to_css(dest));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn serialize_directional_border<W, I>(dest: &mut W,
|
||||
width: &DeclaredValue<I>,
|
||||
style: &DeclaredValue<BorderStyle>,
|
||||
color: &DeclaredValue<CSSColor>)
|
||||
-> fmt::Result where W: fmt::Write, I: ToCss {
|
||||
match *width {
|
||||
DeclaredValue::Value(ref width) => {
|
||||
try!(width.to_css(dest));
|
||||
},
|
||||
_ => {
|
||||
try!(write!(dest, "medium"));
|
||||
}
|
||||
};
|
||||
|
||||
try!(write!(dest, " "));
|
||||
|
||||
match *style {
|
||||
DeclaredValue::Value(ref style) => {
|
||||
try!(style.to_css(dest));
|
||||
},
|
||||
_ => {
|
||||
try!(write!(dest, "none"));
|
||||
}
|
||||
};
|
||||
|
||||
match *color {
|
||||
DeclaredValue::Value(ref color) => {
|
||||
try!(write!(dest, " "));
|
||||
color.to_css(dest)
|
||||
},
|
||||
_ => Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pub fn is_overflow_shorthand<'a, I>(appendable_value: &AppendableValue<'a, I>) -> bool
|
||||
where I: Iterator<Item=&'a PropertyDeclaration> {
|
||||
if let AppendableValue::DeclarationsForShorthand(shorthand, _) = *appendable_value {
|
||||
if let Shorthand::Overflow = shorthand {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
false
|
||||
}
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
use properties::longhands::{text_decoration_color, text_decoration_line, text_decoration_style};
|
||||
use values::specified::CSSColor;
|
||||
|
||||
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
|
||||
let (mut color, mut line, mut style, mut any) = (None, None, None, false);
|
||||
loop {
|
||||
macro_rules! parse_component {
|
||||
|
|
@ -43,4 +44,30 @@
|
|||
text_decoration_line: line.or(Some(text_decoration_line::computed_value::none)),
|
||||
text_decoration_style: style.or(Some(text_decoration_style::computed_value::T::solid)),
|
||||
})
|
||||
}
|
||||
|
||||
impl<'a> ToCss for LonghandsToSerialize<'a> {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
match *self.text_decoration_line {
|
||||
DeclaredValue::Value(ref line) => {
|
||||
try!(line.to_css(dest));
|
||||
},
|
||||
_ => {
|
||||
try!(write!(dest, "none"));
|
||||
}
|
||||
};
|
||||
|
||||
if let DeclaredValue::Value(ref style) = *self.text_decoration_style {
|
||||
try!(write!(dest, " "));
|
||||
try!(style.to_css(dest));
|
||||
}
|
||||
|
||||
if let DeclaredValue::Value(ref color) = *self.text_decoration_color {
|
||||
try!(write!(dest, " "));
|
||||
try!(color.to_css(dest));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
</%helpers:shorthand>
|
||||
|
|
|
|||
|
|
@ -172,23 +172,23 @@ impl ToCss for BorderRadius {
|
|||
self.top_right.0.width == self.top_right.0.height &&
|
||||
self.bottom_right.0.width == self.bottom_right.0.height &&
|
||||
self.bottom_left.0.width == self.bottom_left.0.height {
|
||||
serialize_four_sides((&self.top_left.0.width,
|
||||
serialize_four_sides(dest,
|
||||
&self.top_left.0.width,
|
||||
&self.top_right.0.width,
|
||||
&self.bottom_right.0.width,
|
||||
&self.bottom_left.0.width),
|
||||
dest)
|
||||
&self.bottom_left.0.width)
|
||||
} else {
|
||||
try!(serialize_four_sides((&self.top_left.0.width,
|
||||
try!(serialize_four_sides(dest,
|
||||
&self.top_left.0.width,
|
||||
&self.top_right.0.width,
|
||||
&self.bottom_right.0.width,
|
||||
&self.bottom_left.0.width),
|
||||
dest));
|
||||
&self.bottom_left.0.width));
|
||||
try!(dest.write_str(" / "));
|
||||
serialize_four_sides((&self.top_left.0.height,
|
||||
serialize_four_sides(dest,
|
||||
&self.top_left.0.height,
|
||||
&self.top_right.0.height,
|
||||
&self.bottom_right.0.height,
|
||||
&self.bottom_left.0.height),
|
||||
dest)
|
||||
&self.bottom_left.0.height)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -415,23 +415,23 @@ impl ToCss for BorderRadius {
|
|||
self.top_right.0.width == self.top_right.0.height &&
|
||||
self.bottom_right.0.width == self.bottom_right.0.height &&
|
||||
self.bottom_left.0.width == self.bottom_left.0.height {
|
||||
serialize_four_sides((&self.top_left.0.width,
|
||||
serialize_four_sides(dest,
|
||||
&self.top_left.0.width,
|
||||
&self.top_right.0.width,
|
||||
&self.bottom_right.0.width,
|
||||
&self.bottom_left.0.width),
|
||||
dest)
|
||||
&self.bottom_left.0.width)
|
||||
} else {
|
||||
try!(serialize_four_sides((&self.top_left.0.width,
|
||||
try!(serialize_four_sides(dest,
|
||||
&self.top_left.0.width,
|
||||
&self.top_right.0.width,
|
||||
&self.bottom_right.0.width,
|
||||
&self.bottom_left.0.width),
|
||||
dest));
|
||||
&self.bottom_left.0.width));
|
||||
try!(dest.write_str(" / "));
|
||||
serialize_four_sides((&self.top_left.0.height,
|
||||
serialize_four_sides(dest,
|
||||
&self.top_left.0.height,
|
||||
&self.top_right.0.height,
|
||||
&self.bottom_right.0.height,
|
||||
&self.bottom_left.0.height),
|
||||
dest)
|
||||
&self.bottom_left.0.height)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,114 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use app_units::Au;
|
||||
use cssparser::ToCss;
|
||||
use rustc_serialize::json::Json;
|
||||
use std::env;
|
||||
use std::fs::{File, remove_file};
|
||||
use std::path::Path;
|
||||
use std::process::Command;
|
||||
use std::sync::Arc;
|
||||
use style::computed_values::display::T::inline_block;
|
||||
use style::properties::longhands::border_top_width;
|
||||
use style::properties::{DeclaredValue, PropertyDeclaration, PropertyDeclarationBlock};
|
||||
use style::values::HasViewportPercentage;
|
||||
use style::values::specified::{Length, LengthOrPercentageOrAuto, LengthOrPercentage, ViewportPercentageLength};
|
||||
|
||||
#[test]
|
||||
fn properties_list_json() {
|
||||
let top = Path::new(file!()).parent().unwrap().join("..").join("..").join("..");
|
||||
let json = top.join("target").join("doc").join("servo").join("css-properties.json");
|
||||
if json.exists() {
|
||||
remove_file(&json).unwrap()
|
||||
}
|
||||
let python = env::var("PYTHON").ok().unwrap_or_else(find_python);
|
||||
let script = top.join("components").join("style").join("properties").join("build.py");
|
||||
let status = Command::new(python)
|
||||
.arg(&script)
|
||||
.arg("servo")
|
||||
.arg("html")
|
||||
.status()
|
||||
.unwrap();
|
||||
assert!(status.success());
|
||||
let properties = Json::from_reader(&mut File::open(json).unwrap()).unwrap();
|
||||
assert!(properties.as_object().unwrap().len() > 100);
|
||||
assert!(properties.find("margin").is_some());
|
||||
assert!(properties.find("margin-top").is_some());
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn find_python() -> String {
|
||||
if Command::new("python27.exe").arg("--version").output().is_ok() {
|
||||
return "python27.exe".to_owned();
|
||||
}
|
||||
|
||||
if Command::new("python.exe").arg("--version").output().is_ok() {
|
||||
return "python.exe".to_owned();
|
||||
}
|
||||
|
||||
panic!("Can't find python (tried python27.exe and python.exe)! Try fixing PATH or setting the PYTHON env var");
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
fn find_python() -> String {
|
||||
if Command::new("python2.7").arg("--version").output().unwrap().status.success() {
|
||||
"python2.7"
|
||||
} else {
|
||||
"python"
|
||||
}.to_owned()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn property_declaration_block_should_serialize_correctly() {
|
||||
let mut normal = Vec::new();
|
||||
let mut important = Vec::new();
|
||||
|
||||
let length = LengthOrPercentageOrAuto::Length(Length::from_px(70f32));
|
||||
let value = DeclaredValue::Value(length);
|
||||
normal.push(PropertyDeclaration::Width(value));
|
||||
|
||||
let min_height = LengthOrPercentage::Length(Length::from_px(20f32));
|
||||
let value = DeclaredValue::Value(min_height);
|
||||
normal.push(PropertyDeclaration::MinHeight(value));
|
||||
|
||||
let value = DeclaredValue::Value(inline_block);
|
||||
normal.push(PropertyDeclaration::Display(value));
|
||||
|
||||
let height = LengthOrPercentageOrAuto::Length(Length::from_px(20f32));
|
||||
let value = DeclaredValue::Value(height);
|
||||
important.push(PropertyDeclaration::Height(value));
|
||||
|
||||
normal.reverse();
|
||||
important.reverse();
|
||||
let block = PropertyDeclarationBlock {
|
||||
normal: Arc::new(normal),
|
||||
important: Arc::new(important)
|
||||
};
|
||||
|
||||
let css_string = block.to_css_string();
|
||||
|
||||
assert_eq!(
|
||||
css_string,
|
||||
"width: 70px; min-height: 20px; display: inline-block; height: 20px !important;"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn has_viewport_percentage_for_specified_value() {
|
||||
//TODO: test all specified value with a HasViewportPercentage impl
|
||||
let pvw = PropertyDeclaration::BorderTopWidth(
|
||||
DeclaredValue::Value(border_top_width::SpecifiedValue(
|
||||
Length::ViewportPercentage(ViewportPercentageLength::Vw(100.))
|
||||
))
|
||||
);
|
||||
assert!(pvw.has_viewport_percentage());
|
||||
|
||||
let pabs = PropertyDeclaration::BorderTopWidth(
|
||||
DeclaredValue::Value(border_top_width::SpecifiedValue(
|
||||
Length::Absolute(Au(100))
|
||||
))
|
||||
);
|
||||
assert!(!pabs.has_viewport_percentage());
|
||||
}
|
||||
7
tests/unit/style/properties/mod.rs
Normal file
7
tests/unit/style/properties/mod.rs
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
mod scaffolding;
|
||||
mod serialization;
|
||||
mod viewport;
|
||||
53
tests/unit/style/properties/scaffolding.rs
Normal file
53
tests/unit/style/properties/scaffolding.rs
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use rustc_serialize::json::Json;
|
||||
use std::env;
|
||||
use std::fs::{File, remove_file};
|
||||
use std::path::Path;
|
||||
use std::process::Command;
|
||||
|
||||
#[test]
|
||||
fn properties_list_json() {
|
||||
let top = Path::new(file!()).parent().unwrap().join("..").join("..").join("..").join("..");
|
||||
let json = top.join("target").join("doc").join("servo").join("css-properties.json");
|
||||
if json.exists() {
|
||||
remove_file(&json).unwrap()
|
||||
}
|
||||
let python = env::var("PYTHON").ok().unwrap_or_else(find_python);
|
||||
let script = top.join("components").join("style").join("properties").join("build.py");
|
||||
let status = Command::new(python)
|
||||
.arg(&script)
|
||||
.arg("servo")
|
||||
.arg("html")
|
||||
.status()
|
||||
.unwrap();
|
||||
assert!(status.success());
|
||||
let properties = Json::from_reader(&mut File::open(json).unwrap()).unwrap();
|
||||
assert!(properties.as_object().unwrap().len() > 100);
|
||||
assert!(properties.find("margin").is_some());
|
||||
assert!(properties.find("margin-top").is_some());
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn find_python() -> String {
|
||||
if Command::new("python27.exe").arg("--version").output().is_ok() {
|
||||
return "python27.exe".to_owned();
|
||||
}
|
||||
|
||||
if Command::new("python.exe").arg("--version").output().is_ok() {
|
||||
return "python.exe".to_owned();
|
||||
}
|
||||
|
||||
panic!("Can't find python (tried python27.exe and python.exe)! Try fixing PATH or setting the PYTHON env var");
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
fn find_python() -> String {
|
||||
if Command::new("python2.7").arg("--version").output().unwrap().status.success() {
|
||||
"python2.7"
|
||||
} else {
|
||||
"python"
|
||||
}.to_owned()
|
||||
}
|
||||
829
tests/unit/style/properties/serialization.rs
Normal file
829
tests/unit/style/properties/serialization.rs
Normal file
|
|
@ -0,0 +1,829 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
pub use cssparser::ToCss;
|
||||
pub use std::sync::Arc;
|
||||
pub use style::computed_values::display::T::inline_block;
|
||||
pub use style::properties::{DeclaredValue, PropertyDeclaration, PropertyDeclarationBlock};
|
||||
pub use style::values::specified::{BorderStyle, CSSColor, Length};
|
||||
pub use style::values::specified::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrAutoOrContent};
|
||||
pub use style::properties::longhands::outline_color::computed_value::T as ComputedColor;
|
||||
pub use style::values::RGBA;
|
||||
pub use style::values::specified::UrlExtraData;
|
||||
pub use url::Url;
|
||||
|
||||
#[test]
|
||||
fn property_declaration_block_should_serialize_correctly() {
|
||||
use style::properties::longhands::overflow_x::computed_value::T as OverflowXValue;
|
||||
use style::properties::longhands::overflow_y::computed_value::T as OverflowYContainer;
|
||||
|
||||
let mut normal = Vec::new();
|
||||
let mut important = Vec::new();
|
||||
|
||||
let length = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(70f32)));
|
||||
normal.push(PropertyDeclaration::Width(length));
|
||||
|
||||
let min_height = DeclaredValue::Value(LengthOrPercentage::Length(Length::from_px(20f32)));
|
||||
normal.push(PropertyDeclaration::MinHeight(min_height));
|
||||
|
||||
let value = DeclaredValue::Value(inline_block);
|
||||
normal.push(PropertyDeclaration::Display(value));
|
||||
|
||||
let overflow_x = DeclaredValue::Value(OverflowXValue::auto);
|
||||
normal.push(PropertyDeclaration::OverflowX(overflow_x));
|
||||
|
||||
let overflow_y = DeclaredValue::Value(OverflowYContainer(OverflowXValue::auto));
|
||||
normal.push(PropertyDeclaration::OverflowY(overflow_y));
|
||||
|
||||
let height = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(20f32)));
|
||||
important.push(PropertyDeclaration::Height(height));
|
||||
|
||||
normal.reverse();
|
||||
important.reverse();
|
||||
let block = PropertyDeclarationBlock {
|
||||
normal: Arc::new(normal),
|
||||
important: Arc::new(important)
|
||||
};
|
||||
|
||||
let css_string = block.to_css_string();
|
||||
|
||||
assert_eq!(
|
||||
css_string,
|
||||
"width: 70px; min-height: 20px; display: inline-block; overflow: auto; height: 20px !important;"
|
||||
);
|
||||
}
|
||||
|
||||
mod shorthand_serialization {
|
||||
pub use super::*;
|
||||
|
||||
pub fn shorthand_properties_to_string(properties: Vec<PropertyDeclaration>) -> String {
|
||||
let block = PropertyDeclarationBlock {
|
||||
normal: Arc::new(properties),
|
||||
important: Arc::new(Vec::new())
|
||||
};
|
||||
|
||||
block.to_css_string()
|
||||
}
|
||||
|
||||
// Add Test to show error if a longhand property is missing!!!!!!
|
||||
|
||||
mod overflow {
|
||||
pub use super::*;
|
||||
use style::properties::longhands::overflow_x::computed_value::T as OverflowXValue;
|
||||
use style::properties::longhands::overflow_y::computed_value::T as OverflowYContainer;
|
||||
|
||||
#[test]
|
||||
fn equal_overflow_properties_should_serialize_to_single_value() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let overflow_x = DeclaredValue::Value(OverflowXValue::auto);
|
||||
properties.push(PropertyDeclaration::OverflowX(overflow_x));
|
||||
|
||||
let overflow_y = DeclaredValue::Value(OverflowYContainer(OverflowXValue::auto));
|
||||
properties.push(PropertyDeclaration::OverflowY(overflow_y));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "overflow: auto;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn different_overflow_properties_should_serialize_to_two_values() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let overflow_x = DeclaredValue::Value(OverflowXValue::scroll);
|
||||
properties.push(PropertyDeclaration::OverflowX(overflow_x));
|
||||
|
||||
let overflow_y = DeclaredValue::Value(OverflowYContainer(OverflowXValue::auto));
|
||||
properties.push(PropertyDeclaration::OverflowY(overflow_y));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "overflow-x: scroll; overflow-y: auto;");
|
||||
}
|
||||
}
|
||||
|
||||
mod four_sides_shorthands {
|
||||
pub use super::*;
|
||||
|
||||
// we can use margin as a base to test out the different combinations
|
||||
// but afterwards, we only need to to one test per "four sides shorthand"
|
||||
#[test]
|
||||
fn all_equal_properties_should_serialize_to_one_value() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let px_70 = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(70f32)));
|
||||
properties.push(PropertyDeclaration::MarginTop(px_70.clone()));
|
||||
properties.push(PropertyDeclaration::MarginRight(px_70.clone()));
|
||||
properties.push(PropertyDeclaration::MarginBottom(px_70.clone()));
|
||||
properties.push(PropertyDeclaration::MarginLeft(px_70));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "margin: 70px;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn equal_vertical_and_equal_horizontal_properties_should_serialize_to_two_value() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let vertical_px = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(10f32)));
|
||||
let horizontal_px = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(5f32)));
|
||||
|
||||
properties.push(PropertyDeclaration::MarginTop(vertical_px.clone()));
|
||||
properties.push(PropertyDeclaration::MarginRight(horizontal_px.clone()));
|
||||
properties.push(PropertyDeclaration::MarginBottom(vertical_px));
|
||||
properties.push(PropertyDeclaration::MarginLeft(horizontal_px));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "margin: 10px 5px;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn different_vertical_and_equal_horizontal_properties_should_serialize_to_three_values() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let top_px = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(8f32)));
|
||||
let bottom_px = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(10f32)));
|
||||
let horizontal_px = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(5f32)));
|
||||
|
||||
properties.push(PropertyDeclaration::MarginTop(top_px));
|
||||
properties.push(PropertyDeclaration::MarginRight(horizontal_px.clone()));
|
||||
properties.push(PropertyDeclaration::MarginBottom(bottom_px));
|
||||
properties.push(PropertyDeclaration::MarginLeft(horizontal_px));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "margin: 8px 5px 10px;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn different_properties_should_serialize_to_four_values() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let top_px = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(8f32)));
|
||||
let right_px = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(12f32)));
|
||||
let bottom_px = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(10f32)));
|
||||
let left_px = DeclaredValue::Value(LengthOrPercentageOrAuto::Length(Length::from_px(14f32)));
|
||||
|
||||
properties.push(PropertyDeclaration::MarginTop(top_px));
|
||||
properties.push(PropertyDeclaration::MarginRight(right_px));
|
||||
properties.push(PropertyDeclaration::MarginBottom(bottom_px));
|
||||
properties.push(PropertyDeclaration::MarginLeft(left_px));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "margin: 8px 12px 10px 14px;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn padding_should_serialize_correctly() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let px_10 = DeclaredValue::Value(LengthOrPercentage::Length(Length::from_px(10f32)));
|
||||
let px_15 = DeclaredValue::Value(LengthOrPercentage::Length(Length::from_px(15f32)));
|
||||
properties.push(PropertyDeclaration::PaddingTop(px_10.clone()));
|
||||
properties.push(PropertyDeclaration::PaddingRight(px_15.clone()));
|
||||
properties.push(PropertyDeclaration::PaddingBottom(px_10));
|
||||
properties.push(PropertyDeclaration::PaddingLeft(px_15));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "padding: 10px 15px;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn border_width_should_serialize_correctly() {
|
||||
use style::properties::longhands::border_bottom_width::SpecifiedValue as BottomContainer;
|
||||
use style::properties::longhands::border_left_width::SpecifiedValue as LeftContainer;
|
||||
use style::properties::longhands::border_right_width::SpecifiedValue as RightContainer;
|
||||
use style::properties::longhands::border_top_width::SpecifiedValue as TopContainer;
|
||||
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let top_px = DeclaredValue::Value(TopContainer(Length::from_px(10f32)));
|
||||
let bottom_px = DeclaredValue::Value(BottomContainer(Length::from_px(10f32)));
|
||||
|
||||
let right_px = DeclaredValue::Value(RightContainer(Length::from_px(15f32)));
|
||||
let left_px = DeclaredValue::Value(LeftContainer(Length::from_px(15f32)));
|
||||
|
||||
properties.push(PropertyDeclaration::BorderTopWidth(top_px));
|
||||
properties.push(PropertyDeclaration::BorderRightWidth(right_px));
|
||||
properties.push(PropertyDeclaration::BorderBottomWidth(bottom_px));
|
||||
properties.push(PropertyDeclaration::BorderLeftWidth(left_px));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "border-width: 10px 15px;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn border_color_should_serialize_correctly() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let red = DeclaredValue::Value(CSSColor {
|
||||
parsed: ComputedColor::RGBA(RGBA { red: 1f32, green: 0f32, blue: 0f32, alpha: 1f32 }),
|
||||
authored: None
|
||||
});
|
||||
|
||||
let blue = DeclaredValue::Value(CSSColor {
|
||||
parsed: ComputedColor::RGBA(RGBA { red: 0f32, green: 0f32, blue: 1f32, alpha: 1f32 }),
|
||||
authored: None
|
||||
});
|
||||
|
||||
properties.push(PropertyDeclaration::BorderTopColor(blue.clone()));
|
||||
properties.push(PropertyDeclaration::BorderRightColor(red.clone()));
|
||||
properties.push(PropertyDeclaration::BorderBottomColor(blue));
|
||||
properties.push(PropertyDeclaration::BorderLeftColor(red));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
|
||||
// TODO: Make the rgb test show border-color as blue red instead of below tuples
|
||||
assert_eq!(serialization, "border-color: rgb(0, 0, 255) rgb(255, 0, 0);");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn border_style_should_serialize_correctly() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let solid = DeclaredValue::Value(BorderStyle::solid);
|
||||
let dotted = DeclaredValue::Value(BorderStyle::dotted);
|
||||
properties.push(PropertyDeclaration::BorderTopStyle(solid.clone()));
|
||||
properties.push(PropertyDeclaration::BorderRightStyle(dotted.clone()));
|
||||
properties.push(PropertyDeclaration::BorderBottomStyle(solid));
|
||||
properties.push(PropertyDeclaration::BorderLeftStyle(dotted));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "border-style: solid dotted;");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
mod border_shorthands {
|
||||
use style::properties::longhands::border_bottom_width::SpecifiedValue as BottomContainer;
|
||||
use style::properties::longhands::border_left_width::SpecifiedValue as LeftContainer;
|
||||
use style::properties::longhands::border_right_width::SpecifiedValue as RightContainer;
|
||||
use style::properties::longhands::border_top_width::SpecifiedValue as TopContainer;
|
||||
use super::*;
|
||||
|
||||
// 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"
|
||||
|
||||
#[test]
|
||||
fn directional_border_should_show_all_properties_when_values_are_set() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let width = DeclaredValue::Value(TopContainer(Length::from_px(4f32)));
|
||||
let style = DeclaredValue::Value(BorderStyle::solid);
|
||||
let color = DeclaredValue::Value(CSSColor {
|
||||
parsed: ComputedColor::RGBA(RGBA { red: 1f32, green: 0f32, blue: 0f32, alpha: 1f32 }),
|
||||
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 solid rgb(255, 0, 0);");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn directional_border_with_no_specified_style_will_show_style_as_none() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let width = DeclaredValue::Value(TopContainer(Length::from_px(4f32)));
|
||||
let style = DeclaredValue::Initial;
|
||||
let color = DeclaredValue::Value(CSSColor {
|
||||
parsed: ComputedColor::RGBA(RGBA { red: 1f32, green: 0f32, blue: 0f32, alpha: 1f32 }),
|
||||
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]
|
||||
fn directional_border_with_no_specified_color_will_not_show_color() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let width = DeclaredValue::Value(TopContainer(Length::from_px(4f32)));
|
||||
let style = DeclaredValue::Value(BorderStyle::solid);
|
||||
let color = DeclaredValue::Initial;
|
||||
|
||||
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 solid;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn border_right_should_serialize_correctly() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let width = DeclaredValue::Value(RightContainer(Length::from_px(4f32)));
|
||||
let style = DeclaredValue::Value(BorderStyle::solid);
|
||||
let color = DeclaredValue::Initial;
|
||||
|
||||
properties.push(PropertyDeclaration::BorderRightWidth(width));
|
||||
properties.push(PropertyDeclaration::BorderRightStyle(style));
|
||||
properties.push(PropertyDeclaration::BorderRightColor(color));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "border-right: 4px solid;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn border_bottom_should_serialize_correctly() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let width = DeclaredValue::Value(BottomContainer(Length::from_px(4f32)));
|
||||
let style = DeclaredValue::Value(BorderStyle::solid);
|
||||
let color = DeclaredValue::Initial;
|
||||
|
||||
properties.push(PropertyDeclaration::BorderBottomWidth(width));
|
||||
properties.push(PropertyDeclaration::BorderBottomStyle(style));
|
||||
properties.push(PropertyDeclaration::BorderBottomColor(color));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "border-bottom: 4px solid;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn border_left_should_serialize_correctly() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let width = DeclaredValue::Value(LeftContainer(Length::from_px(4f32)));
|
||||
let style = DeclaredValue::Value(BorderStyle::solid);
|
||||
let color = DeclaredValue::Initial;
|
||||
|
||||
properties.push(PropertyDeclaration::BorderLeftWidth(width));
|
||||
properties.push(PropertyDeclaration::BorderLeftStyle(style));
|
||||
properties.push(PropertyDeclaration::BorderLeftColor(color));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "border-left: 4px solid;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn border_should_serialize_correctly() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let top_width = DeclaredValue::Value(TopContainer(Length::from_px(4f32)));
|
||||
let top_style = DeclaredValue::Value(BorderStyle::solid);
|
||||
let top_color = DeclaredValue::Initial;
|
||||
|
||||
properties.push(PropertyDeclaration::BorderTopWidth(top_width));
|
||||
properties.push(PropertyDeclaration::BorderTopStyle(top_style));
|
||||
properties.push(PropertyDeclaration::BorderTopColor(top_color));
|
||||
|
||||
let right_width = DeclaredValue::Value(RightContainer(Length::from_px(4f32)));
|
||||
let right_style = DeclaredValue::Value(BorderStyle::solid);
|
||||
let right_color = DeclaredValue::Initial;
|
||||
|
||||
properties.push(PropertyDeclaration::BorderRightWidth(right_width));
|
||||
properties.push(PropertyDeclaration::BorderRightStyle(right_style));
|
||||
properties.push(PropertyDeclaration::BorderRightColor(right_color));
|
||||
|
||||
let bottom_width = DeclaredValue::Value(BottomContainer(Length::from_px(4f32)));
|
||||
let bottom_style = DeclaredValue::Value(BorderStyle::solid);
|
||||
let bottom_color = DeclaredValue::Initial;
|
||||
|
||||
properties.push(PropertyDeclaration::BorderBottomWidth(bottom_width));
|
||||
properties.push(PropertyDeclaration::BorderBottomStyle(bottom_style));
|
||||
properties.push(PropertyDeclaration::BorderBottomColor(bottom_color));
|
||||
|
||||
let left_width = DeclaredValue::Value(LeftContainer(Length::from_px(4f32)));
|
||||
let left_style = DeclaredValue::Value(BorderStyle::solid);
|
||||
let left_color = DeclaredValue::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);
|
||||
assert_eq!(serialization, "border: 4px solid;");
|
||||
}
|
||||
}
|
||||
|
||||
mod list_style {
|
||||
use style::properties::longhands::list_style_image::SpecifiedValue as ListStyleImage;
|
||||
use style::properties::longhands::list_style_position::computed_value::T as ListStylePosition;
|
||||
use style::properties::longhands::list_style_type::computed_value::T as ListStyleType;
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn list_style_should_show_all_properties_when_values_are_set() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let position = DeclaredValue::Value(ListStylePosition::inside);
|
||||
let image = DeclaredValue::Value(ListStyleImage::Url(
|
||||
Url::parse("http://servo/test.png").unwrap()
|
||||
));
|
||||
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: 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::Initial;
|
||||
let image = DeclaredValue::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;");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn overflow_wrap_should_only_serialize_with_a_single_property() {
|
||||
use style::properties::longhands::overflow_wrap::computed_value::T as OverflowWrap;
|
||||
|
||||
let value = DeclaredValue::Value(OverflowWrap::break_word);
|
||||
|
||||
let properties = vec![
|
||||
PropertyDeclaration::OverflowWrap(value)
|
||||
];
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
|
||||
// word-wrap is considered an outdated alternative to overflow-wrap, but it is currently
|
||||
// what servo is using in its naming conventions:
|
||||
// https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-wrap
|
||||
assert_eq!(serialization, "word-wrap: break-word;");
|
||||
}
|
||||
|
||||
mod outline {
|
||||
use style::properties::longhands::outline_width::SpecifiedValue as WidthContainer;
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn outline_should_show_all_properties_when_set() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let width = DeclaredValue::Value(WidthContainer(Length::from_px(4f32)));
|
||||
let style = DeclaredValue::Value(BorderStyle::solid);
|
||||
let color = DeclaredValue::Value(CSSColor {
|
||||
parsed: ComputedColor::RGBA(RGBA { red: 1f32, green: 0f32, blue: 0f32, alpha: 1f32 }),
|
||||
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 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(BorderStyle::solid);
|
||||
let color = DeclaredValue::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::Initial;
|
||||
let color = DeclaredValue::Value(CSSColor {
|
||||
parsed: ComputedColor::RGBA(RGBA { red: 1f32, green: 0f32, blue: 0f32, alpha: 1f32 }),
|
||||
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]
|
||||
fn columns_should_serialize_correctly() {
|
||||
use style::properties::longhands::column_count::SpecifiedValue as ColumnCount;
|
||||
use style::properties::longhands::column_width::SpecifiedValue as ColumnWidth;
|
||||
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let width = DeclaredValue::Value(ColumnWidth::Auto);
|
||||
let count = DeclaredValue::Value(ColumnCount::Auto);
|
||||
|
||||
properties.push(PropertyDeclaration::ColumnWidth(width));
|
||||
properties.push(PropertyDeclaration::ColumnCount(count));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "columns: auto auto;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn transition_should_serialize_all_available_properties() {
|
||||
use euclid::point::Point2D;
|
||||
use style::properties::animated_properties::TransitionProperty;
|
||||
use style::properties::longhands::transition_duration::computed_value::T as DurationContainer;
|
||||
use style::properties::longhands::transition_property::computed_value::T as PropertyContainer;
|
||||
use style::properties::longhands::transition_timing_function::computed_value::T as TimingContainer;
|
||||
use style::properties::longhands::transition_timing_function::computed_value::TransitionTimingFunction;
|
||||
use style::values::specified::Time as TimeContainer;
|
||||
|
||||
let property_name = DeclaredValue::Value(
|
||||
PropertyContainer(vec![TransitionProperty::MarginLeft])
|
||||
);
|
||||
|
||||
let duration = DeclaredValue::Value(
|
||||
DurationContainer(vec![TimeContainer(3f32)])
|
||||
);
|
||||
|
||||
let delay = DeclaredValue::Value(
|
||||
DurationContainer(vec![TimeContainer(4f32)])
|
||||
);
|
||||
|
||||
let timing_function = DeclaredValue::Value(
|
||||
TimingContainer(vec![
|
||||
TransitionTimingFunction::CubicBezier(Point2D::new(0f32, 5f32), Point2D::new(5f32, 10f32))
|
||||
])
|
||||
);
|
||||
|
||||
let mut properties = Vec::new();
|
||||
|
||||
properties.push(PropertyDeclaration::TransitionProperty(property_name));
|
||||
properties.push(PropertyDeclaration::TransitionDelay(delay));
|
||||
properties.push(PropertyDeclaration::TransitionDuration(duration));
|
||||
properties.push(PropertyDeclaration::TransitionTimingFunction(timing_function));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "transition: margin-left 3s cubic-bezier(0, 5, 5, 10) 4s;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn flex_should_serialize_all_available_properties() {
|
||||
use style::values::specified::Number as NumberContainer;
|
||||
use style::values::specified::Percentage as PercentageContainer;
|
||||
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let grow = DeclaredValue::Value(NumberContainer(2f32));
|
||||
let shrink = DeclaredValue::Value(NumberContainer(3f32));
|
||||
let basis = DeclaredValue::Value(
|
||||
LengthOrPercentageOrAutoOrContent::Percentage(PercentageContainer(0.5f32))
|
||||
);
|
||||
|
||||
properties.push(PropertyDeclaration::FlexGrow(grow));
|
||||
properties.push(PropertyDeclaration::FlexShrink(shrink));
|
||||
properties.push(PropertyDeclaration::FlexBasis(basis));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "flex: 2 3 50%;");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn flex_flow_should_serialize_all_available_properties() {
|
||||
use style::properties::longhands::flex_direction::computed_value::T as FlexDirection;
|
||||
use style::properties::longhands::flex_wrap::computed_value::T as FlexWrap;
|
||||
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let direction = DeclaredValue::Value(FlexDirection::row);
|
||||
let wrap = DeclaredValue::Value(FlexWrap::wrap);
|
||||
|
||||
properties.push(PropertyDeclaration::FlexDirection(direction));
|
||||
properties.push(PropertyDeclaration::FlexWrap(wrap));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "flex-flow: row wrap;");
|
||||
}
|
||||
|
||||
// TODO: Populate Atom Cache for testing so that the font shorthand can be tested
|
||||
/*
|
||||
mod font {
|
||||
use super::*;
|
||||
use style::properties::longhands::font_family::computed_value::T as FamilyContainer;
|
||||
use style::properties::longhands::font_family::computed_value::FontFamily;
|
||||
use style::properties::longhands::font_style::computed_value::T as FontStyle;
|
||||
use style::properties::longhands::font_variant::computed_value::T as FontVariant;
|
||||
use style::properties::longhands::font_weight::SpecifiedValue as FontWeight;
|
||||
use style::properties::longhands::font_size::SpecifiedValue as FontSizeContainer;
|
||||
use style::properties::longhands::font_stretch::computed_value::T as FontStretch;
|
||||
use style::properties::longhands::line_height::SpecifiedValue as LineHeight;
|
||||
|
||||
#[test]
|
||||
fn font_should_serialize_all_available_properties() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
|
||||
let font_family = DeclaredValue::Value(
|
||||
FamilyContainer(vec![FontFamily::Generic(atom!("serif"))])
|
||||
);
|
||||
|
||||
|
||||
let font_style = DeclaredValue::Value(FontStyle::italic);
|
||||
let font_variant = DeclaredValue::Value(FontVariant::normal);
|
||||
let font_weight = DeclaredValue::Value(FontWeight::Bolder);
|
||||
let font_size = DeclaredValue::Value(FontSizeContainer(
|
||||
LengthOrPercentage::Length(Length::from_px(4f32)))
|
||||
);
|
||||
let font_stretch = DeclaredValue::Value(FontStretch::expanded);
|
||||
let line_height = DeclaredValue::Value(LineHeight::Number(3f32));
|
||||
|
||||
properties.push(PropertyDeclaration::FontFamily(font_family));
|
||||
properties.push(PropertyDeclaration::FontStyle(font_style));
|
||||
properties.push(PropertyDeclaration::FontVariant(font_variant));
|
||||
properties.push(PropertyDeclaration::FontWeight(font_weight));
|
||||
properties.push(PropertyDeclaration::FontSize(font_size));
|
||||
properties.push(PropertyDeclaration::FontStretch(font_stretch));
|
||||
properties.push(PropertyDeclaration::LineHeight(line_height));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "font:;");
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// TODO: Populate Atom Cache for testing so that the animation shorthand can be tested
|
||||
/*
|
||||
#[test]
|
||||
fn animation_should_serialize_all_available_properties() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
assert_eq!(serialization, "animation;");
|
||||
}
|
||||
*/
|
||||
|
||||
mod background {
|
||||
use style::properties::longhands::background_attachment::computed_value::T as Attachment;
|
||||
use style::properties::longhands::background_clip::computed_value::T as Clip;
|
||||
use style::properties::longhands::background_image::SpecifiedValue as ImageContainer;
|
||||
use style::properties::longhands::background_origin::computed_value::T as Origin;
|
||||
use style::properties::longhands::background_position::SpecifiedValue as PositionContainer;
|
||||
use style::properties::longhands::background_repeat::computed_value::T as Repeat;
|
||||
use style::properties::longhands::background_size::SpecifiedExplicitSize;
|
||||
use style::properties::longhands::background_size::SpecifiedValue as Size;
|
||||
use style::values::specified::Image;
|
||||
use style::values::specified::position::Position;
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn background_should_serialize_all_available_properties_when_specified() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let color = DeclaredValue::Value(CSSColor {
|
||||
parsed: ComputedColor::RGBA(RGBA { red: 1f32, green: 0f32, blue: 0f32, alpha: 1f32 }),
|
||||
authored: None
|
||||
});
|
||||
|
||||
let position = DeclaredValue::Value(PositionContainer(
|
||||
Position {
|
||||
horizontal: LengthOrPercentage::Length(Length::from_px(7f32)),
|
||||
vertical: LengthOrPercentage::Length(Length::from_px(4f32))
|
||||
}
|
||||
));
|
||||
|
||||
let repeat = DeclaredValue::Value(Repeat::repeat_x);
|
||||
let attachment = DeclaredValue::Value(Attachment::scroll);
|
||||
|
||||
let image = DeclaredValue::Value(ImageContainer(
|
||||
Some(Image::Url(Url::parse("http://servo/test.png").unwrap(), UrlExtraData {}))
|
||||
));
|
||||
|
||||
let size = DeclaredValue::Value(
|
||||
Size::Explicit(SpecifiedExplicitSize {
|
||||
width: LengthOrPercentageOrAuto::Length(Length::from_px(70f32)),
|
||||
height: LengthOrPercentageOrAuto::Length(Length::from_px(50f32))
|
||||
}
|
||||
));
|
||||
|
||||
let origin = DeclaredValue::Value(Origin::border_box);
|
||||
let clip = DeclaredValue::Value(Clip::padding_box);
|
||||
|
||||
properties.push(PropertyDeclaration::BackgroundColor(color));
|
||||
properties.push(PropertyDeclaration::BackgroundPosition(position));
|
||||
properties.push(PropertyDeclaration::BackgroundRepeat(repeat));
|
||||
properties.push(PropertyDeclaration::BackgroundAttachment(attachment));
|
||||
properties.push(PropertyDeclaration::BackgroundImage(image));
|
||||
properties.push(PropertyDeclaration::BackgroundSize(size));
|
||||
properties.push(PropertyDeclaration::BackgroundOrigin(origin));
|
||||
properties.push(PropertyDeclaration::BackgroundClip(clip));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
|
||||
assert_eq!(
|
||||
serialization,
|
||||
"background: rgb(255, 0, 0) url(\"http://servo/test.png\") repeat-x \
|
||||
scroll 7px 4px / 70px 50px border-box padding-box;"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn background_should_combine_origin_and_clip_properties_when_equal() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let color = DeclaredValue::Value(CSSColor {
|
||||
parsed: ComputedColor::RGBA(RGBA { red: 1f32, green: 0f32, blue: 0f32, alpha: 1f32 }),
|
||||
authored: None
|
||||
});
|
||||
|
||||
let position = DeclaredValue::Value(PositionContainer(
|
||||
Position {
|
||||
horizontal: LengthOrPercentage::Length(Length::from_px(7f32)),
|
||||
vertical: LengthOrPercentage::Length(Length::from_px(4f32))
|
||||
}
|
||||
));
|
||||
|
||||
let repeat = DeclaredValue::Value(Repeat::repeat_x);
|
||||
let attachment = DeclaredValue::Value(Attachment::scroll);
|
||||
|
||||
let image = DeclaredValue::Value(ImageContainer(
|
||||
Some(Image::Url(Url::parse("http://servo/test.png").unwrap(), UrlExtraData {}))
|
||||
));
|
||||
|
||||
let size = DeclaredValue::Value(
|
||||
Size::Explicit(SpecifiedExplicitSize {
|
||||
width: LengthOrPercentageOrAuto::Length(Length::from_px(70f32)),
|
||||
height: LengthOrPercentageOrAuto::Length(Length::from_px(50f32))
|
||||
})
|
||||
);
|
||||
|
||||
let origin = DeclaredValue::Value(Origin::padding_box);
|
||||
let clip = DeclaredValue::Value(Clip::padding_box);
|
||||
|
||||
properties.push(PropertyDeclaration::BackgroundColor(color));
|
||||
properties.push(PropertyDeclaration::BackgroundPosition(position));
|
||||
properties.push(PropertyDeclaration::BackgroundRepeat(repeat));
|
||||
properties.push(PropertyDeclaration::BackgroundAttachment(attachment));
|
||||
properties.push(PropertyDeclaration::BackgroundImage(image));
|
||||
properties.push(PropertyDeclaration::BackgroundSize(size));
|
||||
properties.push(PropertyDeclaration::BackgroundOrigin(origin));
|
||||
properties.push(PropertyDeclaration::BackgroundClip(clip));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(
|
||||
serialization,
|
||||
"background: rgb(255, 0, 0) url(\"http://servo/test.png\") repeat-x \
|
||||
scroll 7px 4px / 70px 50px padding-box;"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn background_should_always_print_color_and_url_and_repeat_and_attachment_and_position() {
|
||||
let mut properties = Vec::new();
|
||||
|
||||
let color = DeclaredValue::Value(CSSColor {
|
||||
parsed: ComputedColor::RGBA(RGBA { red: 1f32, green: 0f32, blue: 0f32, alpha: 1f32 }),
|
||||
authored: None
|
||||
});
|
||||
|
||||
let position = DeclaredValue::Value(PositionContainer(
|
||||
Position {
|
||||
horizontal: LengthOrPercentage::Length(Length::from_px(0f32)),
|
||||
vertical: LengthOrPercentage::Length(Length::from_px(0f32))
|
||||
}
|
||||
));
|
||||
|
||||
let repeat = DeclaredValue::Value(Repeat::repeat_x);
|
||||
let attachment = DeclaredValue::Value(Attachment::scroll);
|
||||
|
||||
let image = DeclaredValue::Value(ImageContainer(None));
|
||||
|
||||
let size = DeclaredValue::Initial;
|
||||
|
||||
let origin = DeclaredValue::Initial;
|
||||
let clip = DeclaredValue::Initial;
|
||||
|
||||
properties.push(PropertyDeclaration::BackgroundColor(color));
|
||||
properties.push(PropertyDeclaration::BackgroundPosition(position));
|
||||
properties.push(PropertyDeclaration::BackgroundRepeat(repeat));
|
||||
properties.push(PropertyDeclaration::BackgroundAttachment(attachment));
|
||||
properties.push(PropertyDeclaration::BackgroundImage(image));
|
||||
properties.push(PropertyDeclaration::BackgroundSize(size));
|
||||
properties.push(PropertyDeclaration::BackgroundOrigin(origin));
|
||||
properties.push(PropertyDeclaration::BackgroundClip(clip));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
assert_eq!(serialization, "background: rgb(255, 0, 0) none repeat-x scroll 0px 0px;");
|
||||
}
|
||||
}
|
||||
}
|
||||
27
tests/unit/style/properties/viewport.rs
Normal file
27
tests/unit/style/properties/viewport.rs
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use app_units::Au;
|
||||
use style::properties::longhands::border_top_width;
|
||||
use style::properties::{DeclaredValue, PropertyDeclaration};
|
||||
use style::values::HasViewportPercentage;
|
||||
use style::values::specified::{Length, ViewportPercentageLength};
|
||||
|
||||
#[test]
|
||||
fn has_viewport_percentage_for_specified_value() {
|
||||
//TODO: test all specified value with a HasViewportPercentage impl
|
||||
let pvw = PropertyDeclaration::BorderTopWidth(
|
||||
DeclaredValue::Value(border_top_width::SpecifiedValue(
|
||||
Length::ViewportPercentage(ViewportPercentageLength::Vw(100.))
|
||||
))
|
||||
);
|
||||
assert!(pvw.has_viewport_percentage());
|
||||
|
||||
let pabs = PropertyDeclaration::BorderTopWidth(
|
||||
DeclaredValue::Value(border_top_width::SpecifiedValue(
|
||||
Length::Absolute(Au(100))
|
||||
))
|
||||
);
|
||||
assert!(!pabs.has_viewport_percentage());
|
||||
}
|
||||
|
|
@ -18,27 +18,12 @@
|
|||
[shorthand border can be set with setProperty]
|
||||
expected: FAIL
|
||||
|
||||
[shorthand border-color can be set with setProperty]
|
||||
expected: FAIL
|
||||
|
||||
[shorthand border-style can be set with setProperty]
|
||||
expected: FAIL
|
||||
|
||||
[shorthand border-width can be set with setProperty]
|
||||
expected: FAIL
|
||||
|
||||
[shorthand list-style can be set with setProperty]
|
||||
expected: FAIL
|
||||
|
||||
[shorthand margin can be set with setProperty]
|
||||
expected: FAIL
|
||||
|
||||
[shorthand outline can be set with setProperty]
|
||||
expected: FAIL
|
||||
|
||||
[shorthand padding can be set with setProperty]
|
||||
expected: FAIL
|
||||
|
||||
[shorthand background can be set with setProperty]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
[index-001.htm]
|
||||
type: testharness
|
||||
[margin_20px_20px]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -3,9 +3,6 @@
|
|||
[border is expected to be border: 1px;]
|
||||
expected: FAIL
|
||||
|
||||
[border is expected to be border: 1px solid red;]
|
||||
expected: FAIL
|
||||
|
||||
[border is expected to be border: 1px red;]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -27,10 +24,7 @@
|
|||
[border is expected to be border: dotted;]
|
||||
expected: FAIL
|
||||
|
||||
[border is expected to be border-width: 1px;]
|
||||
expected: FAIL
|
||||
|
||||
[overflow is expected to be overflow: scroll;]
|
||||
[overflow is expected to be overflow: scroll hidden;]
|
||||
expected: FAIL
|
||||
|
||||
[outline is expected to be outline: blue dotted 2px;]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
[calc.html]
|
||||
type: testharness
|
||||
[calc for border-width]
|
||||
expected: FAIL
|
||||
|
||||
[calc for column-width]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
[style_no_trailing_space.html]
|
||||
type: testharness
|
||||
[Untitled]
|
||||
expected: FAIL
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue