From 0c92350479a892e4e9db226cbf033d02ba8c14e8 Mon Sep 17 00:00:00 2001 From: Cameron McCormack Date: Tue, 10 May 2016 11:00:32 +1000 Subject: [PATCH] Support outline-width in geckolib. --- ports/geckolib/gecko_style_structs.rs | 2 +- ports/geckolib/properties.mako.rs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/geckolib/gecko_style_structs.rs b/ports/geckolib/gecko_style_structs.rs index 884eb892c3a..0f80898c824 100644 --- a/ports/geckolib/gecko_style_structs.rs +++ b/ports/geckolib/gecko_style_structs.rs @@ -4700,7 +4700,7 @@ pub struct nsStyleOutline { pub mOutlineRadius: nsStyleCorners, pub mOutlineWidth: nsStyleCoord, pub mOutlineOffset: nscoord, - pub mCachedOutlineWidth: nscoord, + pub mActualOutlineWidth: nscoord, pub mOutlineColor: nscolor, pub mOutlineStyle: u8, pub mTwipsPerPixel: nscoord, diff --git a/ports/geckolib/properties.mako.rs b/ports/geckolib/properties.mako.rs index a4d5b2a3cd1..0b92d506d0b 100644 --- a/ports/geckolib/properties.mako.rs +++ b/ports/geckolib/properties.mako.rs @@ -555,7 +555,7 @@ fn static_assert() { % endfor -<% skip_outline_longhands = " ".join("outline-color outline-style".split() + +<% skip_outline_longhands = " ".join("outline-color outline-style outline-width".split() + ["-moz-outline-radius-{0}".format(x.ident.replace("_", "")) for x in CORNERS]) %> <%self:impl_trait style_struct_name="Outline" @@ -566,6 +566,9 @@ fn static_assert() { <% impl_color("outline_color", "mOutlineColor", color_flags_ffi_name="mOutlineStyle") %> + <% impl_app_units("outline_width", "mActualOutlineWidth", need_clone=False, + round_to_pixels=True) %> + % for corner in CORNERS: <% impl_corner_style_coord("_moz_outline_radius_%s" % corner.ident.replace("_", ""), "mOutlineRadius.mUnits[%s]" % corner.x_index, @@ -575,7 +578,7 @@ fn static_assert() { % endfor fn outline_has_nonzero_width(&self) -> bool { - self.gecko.mCachedOutlineWidth != 0 + self.gecko.mActualOutlineWidth != 0 }