servo: Merge #15646 - Actually include file with marker shorthand (from Manishearth:marker); r=heycam
authorManish Goregaokar <manishsmail@gmail.com>
Sun, 19 Feb 2017 00:07:40 -0800
changeset 372752 e024a5f6cd9221ea7ad1a18fb27d9203989a46a5
parent 372751 be250556a6cb38d3a32c154bb1cdb169844cac40
child 372753 86affde3caa48a6a9f13aceb4927e13eabd01c2e
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)
reviewersheycam
milestone54.0a1
servo: Merge #15646 - Actually include file with marker shorthand (from Manishearth:marker); r=heycam This wasn't being included so nothing was actually happening. r? @heycam or @mbrubeck Source-Repo: https://github.com/servo/servo Source-Revision: d88e275f1f0f458be9c60f6c400aa173ebd4832d
servo/components/style/properties/properties.mako.rs
servo/components/style/properties/shorthand/inherited_svg.mako.rs
--- a/servo/components/style/properties/properties.mako.rs
+++ b/servo/components/style/properties/properties.mako.rs
@@ -161,16 +161,17 @@ pub mod shorthands {
     <%include file="/shorthand/font.mako.rs" />
     <%include file="/shorthand/inherited_text.mako.rs" />
     <%include file="/shorthand/list.mako.rs" />
     <%include file="/shorthand/margin.mako.rs" />
     <%include file="/shorthand/mask.mako.rs" />
     <%include file="/shorthand/outline.mako.rs" />
     <%include file="/shorthand/padding.mako.rs" />
     <%include file="/shorthand/position.mako.rs" />
+    <%include file="/shorthand/inherited_svg.mako.rs" />
     <%include file="/shorthand/text.mako.rs" />
 }
 
 /// A module with all the code related to animated properties.
 ///
 /// This needs to be "included" by mako at least after all longhand modules,
 /// given they populate the global data.
 pub mod animated_properties {
--- a/servo/components/style/properties/shorthand/inherited_svg.mako.rs
+++ b/servo/components/style/properties/shorthand/inherited_svg.mako.rs
@@ -5,22 +5,23 @@
 <%namespace name="helpers" file="/helpers.mako.rs" />
 
 <%helpers:shorthand name="marker" products="gecko"
     sub_properties="marker-start marker-end marker-mid"
     spec="https://www.w3.org/TR/SVG2/painting.html#MarkerShorthand">
     use values::specified::UrlOrNone;
 
     pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
+        use parser::Parse;
         let url = UrlOrNone::parse(context, input)?;
 
         Ok(Longhands {
-            marker_start: url.clone(),
-            marker_mid: url.clone(),
-            marker_end: url,
+            marker_start: Some(url.clone()),
+            marker_mid: Some(url.clone()),
+            marker_end: Some(url),
         })
     }
 
     impl<'a> LonghandsToSerialize<'a>  {
         fn to_css_declared<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
             if let DeclaredValue::Value(ref start) = *self.marker_start {
                 if let DeclaredValue::Value(ref mid) = *self.marker_mid {
                     if let DeclaredValue::Value(ref end) = *self.marker_end {