Skip to content

Commit

Permalink
Auto merge of #20186 - emilio:fixup-fill, r=nox
Browse files Browse the repository at this point in the history
style: Fix text-emphasis-style conversion.

Was accidentally broken in #20178 and is causing orange.

<!-- 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/20186)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Mar 3, 2018
2 parents 0c9be9f + 569dde7 commit 2425939
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions components/style/properties/gecko.mako.rs
Expand Up @@ -4766,15 +4766,17 @@ fn static_assert() {

if self.gecko.mTextEmphasisStyle == structs::NS_STYLE_TEXT_EMPHASIS_STYLE_NONE as u8 {
return T::None;
} else if self.gecko.mTextEmphasisStyle == structs::NS_STYLE_TEXT_EMPHASIS_STYLE_STRING as u8 {
}

if self.gecko.mTextEmphasisStyle == structs::NS_STYLE_TEXT_EMPHASIS_STYLE_STRING as u8 {
return T::String(self.gecko.mTextEmphasisStyleString.to_string());
}

let fill = match self.gecko.mTextEmphasisStyle as u32 {
structs::NS_STYLE_TEXT_EMPHASIS_STYLE_FILLED => FillMode::Filled,
structs::NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN => FillMode::Open,
_ => panic!("Unexpected value in style struct for text-emphasis-style property"),
};
let fill =
self.gecko.mTextEmphasisStyle & structs::NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN as u8 == 0;

let fill = if fill { FillMode::Filled } else { FillMode::Open };

let shape =
match self.gecko.mTextEmphasisStyle as u32 & !structs::NS_STYLE_TEXT_EMPHASIS_STYLE_OPEN {
structs::NS_STYLE_TEXT_EMPHASIS_STYLE_DOT => ShapeKeyword::Dot,
Expand All @@ -4785,10 +4787,7 @@ fn static_assert() {
_ => panic!("Unexpected value in style struct for text-emphasis-style property")
};

T::Keyword(KeywordValue {
fill: fill,
shape: shape
})
T::Keyword(KeywordValue { fill, shape })
}

${impl_non_negative_length('_webkit_text_stroke_width',
Expand Down

0 comments on commit 2425939

Please sign in to comment.