servo: Merge #15617 - Fix -moz aliases for border-{start,end} properties (from mbrubeck:border); r=upsuper
authorMatt Brubeck <mbrubeck@limpet.net>
Fri, 17 Feb 2017 13:58:05 -0800
changeset 372695 259591bde104bef38510868164bc1f32055fbdfc
parent 372694 67ef6204c39823d2471293cd8e6554445d8e5625
child 372696 23391448faad86360d6eba8269146ba2a00ddee9
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersupsuper
milestone54.0a1
servo: Merge #15617 - Fix -moz aliases for border-{start,end} properties (from mbrubeck:border); r=upsuper Fixes #15297. r? @upsuper or @Manishearth Source-Repo: https://github.com/servo/servo Source-Revision: 9cb3e31c1d215ede5c31bcd8536eca3d0f9e28a6
servo/components/style/properties/longhand/border.mako.rs
servo/components/style/properties/shorthand/border.mako.rs
--- a/servo/components/style/properties/longhand/border.mako.rs
+++ b/servo/components/style/properties/longhand/border.mako.rs
@@ -29,17 +29,17 @@
                               need_clone=True,
                               alias=maybe_moz_logical_alias(product, side, "-moz-border-%s-style"),
                               spec=maybe_logical_spec(side, "style"),
                               animatable=False, logical = side[1])}
 % endfor
 
 % for side in ALL_SIDES:
     <%helpers:longhand name="border-${side[0]}-width" animatable="True" logical="${side[1]}"
-                       alias=maybe_moz_logical_alias(product, side, "-moz-border-%s-width")
+                       alias="${maybe_moz_logical_alias(product, side, '-moz-border-%s-width')}"
                        spec="${maybe_logical_spec(side, 'width')}">
         use app_units::Au;
         use std::fmt;
         use style_traits::ToCss;
         use values::HasViewportPercentage;
         use values::specified::BorderWidth;
 
         pub type SpecifiedValue = BorderWidth;
--- a/servo/components/style/properties/shorthand/border.mako.rs
+++ b/servo/components/style/properties/shorthand/border.mako.rs
@@ -79,20 +79,24 @@ pub fn parse_border(context: &ParserCont
 }
 
 % for side, logical in ALL_SIDES:
     <%
         spec = "https://drafts.csswg.org/css-backgrounds/#border-%s" % side
         if logical:
             spec = "https://drafts.csswg.org/css-logical-props/#propdef-border-%s" % side
     %>
-    <%helpers:shorthand name="border-${side}" sub_properties="${' '.join(
-        'border-%s-%s' % (side, prop)
-        for prop in ['color', 'style', 'width']
-    )}" alias=maybe_moz_logical_alias(product, side, "-moz-border-%s") spec="${spec}">
+    <%helpers:shorthand
+        name="border-${side}"
+        sub_properties="${' '.join(
+            'border-%s-%s' % (side, prop)
+            for prop in ['color', 'style', 'width']
+        )}"
+        alias="${maybe_moz_logical_alias(product, (side, logical), '-moz-border-%s')}"
+        spec="${spec}">
 
     pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
         let (color, style, width) = try!(super::parse_border(context, input));
         Ok(Longhands {
             border_${to_rust_ident(side)}_color: color,
             border_${to_rust_ident(side)}_style: style,
             border_${to_rust_ident(side)}_width: width
         })