Auto merge of #11086 - heycam:radius, r=bholley

Support border/outline-radius properties in geckolib.

<s>Because of the way Gecko stores outline-width in nsStyleOutline::mOutlineWidth (i.e., as its specified value for keywords) we need separate property implementations for servo/gecko products.</s>

The -moz-outline-radius parsing is a bit of a hack; I was just avoiding the effort of factoring out the parsing into a separate method. Let me know if I should do that.

<s>Gecko-side changes are https://bugzilla.mozilla.org/show_bug.cgi?id=1271168.</s>

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11086)
<!-- Reviewable:end -->

components/style/properties/data.py

@@ -145,7 +145,11 @@ class PropertiesData(object):
 
         return longand
 
-    def declare_shorthand(self, name, sub_properties, *args, **kwargs):
+    def declare_shorthand(self, name, sub_properties, products="gecko servo", *args, **kwargs):
+        products = products.split()
+        if self.product not in products:
+            return
+
         sub_properties = [self.longhands_by_name[s] for s in sub_properties]
         shorthand = Shorthand(name, sub_properties, *args, **kwargs)
         self.shorthands.append(shorthand)

components/style/properties/helpers.mako.rs

@@ -191,10 +191,12 @@
     </%call>
 </%def>
 
-<%def name="shorthand(name, sub_properties, experimental=False)">
+<%def name="shorthand(name, sub_properties, experimental=False, **kwargs)">
 <%
-    shorthand = data.declare_shorthand(name, sub_properties.split(), experimental=experimental)
+    shorthand = data.declare_shorthand(name, sub_properties.split(), experimental=experimental,
+                                       **kwargs)
 %>
+    % if shorthand:
     pub mod ${shorthand.ident} {
         use cssparser::Parser;
         use parser::ParserContext;
@@ -252,6 +254,7 @@
             ${caller.body()}
         }
     }
+    % endif
 </%def>
 
 <%def name="four_sides_shorthand(name, sub_property_pattern, parser_function)">

components/style/properties/longhand/outline.mako.rs

@@ -58,4 +58,11 @@ ${helpers.predefined_type("outline-color", "CSSColor", "::cssparser::Color::Curr
     }
 </%helpers:longhand>
 
+// The -moz-outline-radius-* properties are non-standard and not on a standards track.
+% for corner in ["topleft", "topright", "bottomright", "bottomleft"]:
+    ${helpers.predefined_type("-moz-outline-radius-" + corner, "BorderRadiusSize",
+                              "computed::BorderRadiusSize::zero()",
+                              "parse", products="gecko")}
+% endfor
+
 ${helpers.predefined_type("outline-offset", "Length", "Au(0)")}

components/style/properties/shorthand/outline.mako.rs

@@ -47,3 +47,20 @@
         Err(())
     }
 </%helpers:shorthand>
+
+// The -moz-outline-radius shorthand is non-standard and not on a standards track.
+<%helpers:shorthand name="-moz-outline-radius" sub_properties="${' '.join(
+    '-moz-outline-radius-%s' % corner
+    for corner in ['topleft', 'topright', 'bottomright', 'bottomleft']
+)}" products="gecko">
+    use properties::shorthands;
+
+    // Re-use border-radius parsing.
+    shorthands::border_radius::parse_value(context, input).map(|longhands| {
+        Longhands {
+            % for corner in ["top_left", "top_right", "bottom_right", "bottom_left"]:
+            _moz_outline_radius_${corner.replace("_", "")}: longhands.border_${corner}_radius,
+            % endfor
+        }
+    })
+</%helpers:shorthand>

ports/geckolib/properties.mako.rs

@@ -283,8 +283,8 @@ def set_gecko_property(ffi_name, expr):
     }
     fn copy_${ident}_from(&mut self, other: &Self) {
         use gecko_style_structs::nsStyleUnit::eStyleUnit_Calc;
-        assert!(self.gecko.${unit_ffi_name} != eStyleUnit_Calc,
-                "stylo: Can't yet handle refcounted Calc");
+        debug_assert!(self.gecko.${unit_ffi_name} != eStyleUnit_Calc,
+                      "stylo: Can't yet handle refcounted Calc");
         self.gecko.${unit_ffi_name} =  other.gecko.${unit_ffi_name};
         self.gecko.${union_ffi_name} = other.gecko.${union_ffi_name};
     }
@@ -294,6 +294,25 @@ def set_gecko_property(ffi_name, expr):
 <%call expr="impl_split_style_coord(ident, '%s.mUnit' % gecko_ffi_name, '%s.mValue' % gecko_ffi_name)"></%call>
 </%def>
 
+<%def name="impl_corner_style_coord(ident, x_unit_ffi_name, x_union_ffi_name, y_unit_ffi_name, y_union_ffi_name)">
+    fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) {
+        v.0.width.to_gecko_style_coord(&mut self.gecko.${x_unit_ffi_name},
+                                       &mut self.gecko.${x_union_ffi_name});
+        v.0.height.to_gecko_style_coord(&mut self.gecko.${y_unit_ffi_name},
+                                        &mut self.gecko.${y_union_ffi_name});
+    }
+    fn copy_${ident}_from(&mut self, other: &Self) {
+        use gecko_style_structs::nsStyleUnit::eStyleUnit_Calc;
+        debug_assert!(self.gecko.${x_unit_ffi_name} != eStyleUnit_Calc &&
+                      self.gecko.${y_unit_ffi_name} != eStyleUnit_Calc,
+                      "stylo: Can't yet handle refcounted Calc");
+        self.gecko.${x_unit_ffi_name} = other.gecko.${x_unit_ffi_name};
+        self.gecko.${x_union_ffi_name} = other.gecko.${x_union_ffi_name};
+        self.gecko.${y_unit_ffi_name} = other.gecko.${y_unit_ffi_name};
+        self.gecko.${y_union_ffi_name} = other.gecko.${y_union_ffi_name};
+    }
+</%def>
+
 <%def name="impl_style_struct(style_struct)">
 impl ${style_struct.gecko_struct_name} {
     #[allow(dead_code, unused_variables)]
@@ -436,8 +455,16 @@ class Side(object):
         self.ident = name.lower()
         self.index = index
 
-SIDES = [Side("Top", 0), Side("Right", 1), Side("Bottom", 2), Side("Left", 3)]
+class Corner(object):
+    def __init__(self, name, index):
+        self.x_name = "NS_CORNER_" + name + "_X"
+        self.y_name = "NS_CORNER_" + name + "_Y"
+        self.ident = name.lower()
+        self.x_index = 2 * index
+        self.y_index = 2 * index + 1
 
+SIDES = [Side("Top", 0), Side("Right", 1), Side("Bottom", 2), Side("Left", 3)]
+CORNERS = [Corner("TOP_LEFT", 0), Corner("TOP_RIGHT", 1), Corner("BOTTOM_RIGHT", 2), Corner("BOTTOM_LEFT", 3)]
 %>
 
 #[allow(dead_code)]
@@ -446,14 +473,21 @@ fn static_assert() {
     % for side in SIDES:
         transmute::<_, [u32; ${side.index}]>([1; gecko_style_structs::Side::eSide${side.name} as usize]);
     % endfor
+    % for corner in CORNERS:
+        transmute::<_, [u32; ${corner.x_index}]>([1; gecko_style_structs::${corner.x_name} as usize]);
+        transmute::<_, [u32; ${corner.y_index}]>([1; gecko_style_structs::${corner.y_name} as usize]);
+    % endfor
     }
 }
 
 <% border_style_keyword = Keyword("border-style",
                                   "none solid double dotted dashed hidden groove ridge inset outset") %>
 
-<% skip_border_longhands = " ".join(["border-{0}-color border-{0}-style border-{0}-width ".format(x.ident)
-                                     for x in SIDES]) %>
+<% skip_border_longhands = " ".join(["border-{0}-{1}".format(x.ident, y)
+                                     for x in SIDES
+                                     for y in ["color", "style", "width"]] +
+                                    ["border-{0}-radius".format(x.ident.replace("_", "-"))
+                                     for x in CORNERS]) %>
 <%self:impl_trait style_struct_name="Border"
                   skip_longhands="${skip_border_longhands}"
                   skip_additionals="*">
@@ -471,6 +505,14 @@ fn static_assert() {
         self.gecko.mComputedBorder.${side.ident} != 0
     }
     % endfor
+
+    % for corner in CORNERS:
+    <% impl_corner_style_coord("border_%s_radius" % corner.ident,
+                               "mBorderRadius.mUnits[%s]" % corner.x_index,
+                               "mBorderRadius.mValues[%s]" % corner.x_index,
+                               "mBorderRadius.mUnits[%s]" % corner.y_index,
+                               "mBorderRadius.mValues[%s]" % corner.y_index) %>
+    % endfor
 </%self:impl_trait>
 
 <% skip_margin_longhands = " ".join(["margin-%s" % x.ident for x in SIDES]) %>
@@ -506,14 +548,25 @@ fn static_assert() {
     % endfor
 </%self:impl_trait>
 
+<% skip_outline_longhands = " ".join("outline-color outline-style".split() +
+                                     ["-moz-outline-radius-{0}".format(x.ident.replace("_", ""))
+                                      for x in CORNERS]) %>
 <%self:impl_trait style_struct_name="Outline"
-                  skip_longhands="outline-color outline-style"
+                  skip_longhands="${skip_outline_longhands}"
                   skip_additionals="*">
 
     <% impl_keyword("outline_style", "mOutlineStyle", border_style_keyword, need_clone=True) %>
 
     <% impl_color("outline_color", "mOutlineColor", color_flags_ffi_name="mOutlineStyle") %>
 
+    % for corner in CORNERS:
+    <% impl_corner_style_coord("_moz_outline_radius_%s" % corner.ident.replace("_", ""),
+                               "mOutlineRadius.mUnits[%s]" % corner.x_index,
+                               "mOutlineRadius.mValues[%s]" % corner.x_index,
+                               "mOutlineRadius.mUnits[%s]" % corner.y_index,
+                               "mOutlineRadius.mValues[%s]" % corner.y_index) %>
+    % endfor
+
     fn outline_has_nonzero_width(&self) -> bool {
         self.gecko.mCachedOutlineWidth != 0
     }