diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-12-13 19:30:26 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-13 19:30:26 -0600 |
commit | 714c1b2455bc6f651e982b5efec85e3bf711f708 (patch) | |
tree | 9db5128d669c7b264f73224c10802552ea5061e0 /components/layout/display_list_builder.rs | |
parent | 8ca43e41efca61b015c47f4d109c4d49b2a4ea0b (diff) | |
parent | b9b91b33be2365d40d2f7c101da82171ef6a8761 (diff) | |
download | servo-714c1b2455bc6f651e982b5efec85e3bf711f708.tar.gz servo-714c1b2455bc6f651e982b5efec85e3bf711f708.zip |
Auto merge of #19548 - CYBAI:move-outline-style-out-of-mako, r=emilio
style: Move outline-style outside of mako
This is a sub-PR of #19015
r? emilio
---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #19546
- [x] These changes do not require tests
<!-- 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/19548)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/display_list_builder.rs')
-rw-r--r-- | components/layout/display_list_builder.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index 1bcd251b886..efe07fd5758 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -1700,7 +1700,7 @@ impl FragmentDisplayListBuilding for Fragment { style: &ComputedValues, bounds: &Rect<Au>, clip: &Rect<Au>) { - use style::values::Either; + use style::values::specified::outline::OutlineStyle; let width = Au::from(style.get_outline().outline_width); if width == Au(0) { @@ -1708,9 +1708,9 @@ impl FragmentDisplayListBuilding for Fragment { } let outline_style = match style.get_outline().outline_style { - Either::First(_auto) => BorderStyle::Solid, - Either::Second(BorderStyle::None) => return, - Either::Second(border_style) => border_style + OutlineStyle::Auto => BorderStyle::Solid, + OutlineStyle::Other(BorderStyle::None) => return, + OutlineStyle::Other(border_style) => border_style }; // Outlines are not accounted for in the dimensions of the border box, so adjust the |