Skip to content

Commit

Permalink
Auto merge of #15210 - upsuper:text-decoration-line, r=Manishearth
Browse files Browse the repository at this point in the history
Serialize text-decoration-line to none if nothing specified

<!-- 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/15210)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Jan 25, 2017
2 parents 2b623fc + b0f5f20 commit 2a32cf1
Showing 1 changed file with 16 additions and 22 deletions.
38 changes: 16 additions & 22 deletions components/style/properties/longhand/text.mako.rs
Expand Up @@ -122,30 +122,24 @@ ${helpers.single_keyword("unicode-bidi",

impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
let mut space = false;
if self.underline {
try!(dest.write_str("underline"));
space = true;
}
if self.overline {
if space {
try!(dest.write_str(" "));
}
try!(dest.write_str("overline"));
space = true;
}
if self.line_through {
if space {
try!(dest.write_str(" "));
let mut has_any = false;
macro_rules! write_value {
($line:ident => $css:expr) => {
if self.$line {
if has_any {
dest.write_str(" ")?;
}
dest.write_str($css)?;
has_any = true;
}
}
try!(dest.write_str("line-through"));
space = true;
}
if self.blink {
if space {
try!(dest.write_str(" "));
}
try!(dest.write_str("blink"));
write_value!(underline => "underline");
write_value!(overline => "overline");
write_value!(line_through => "line-through");
write_value!(blink => "blink");
if !has_any {
dest.write_str("none")?;
}
Ok(())
}
Expand Down

0 comments on commit 2a32cf1

Please sign in to comment.