From 8fa0d37b1dfd3a548005ebf2c920b058dc1345ec Mon Sep 17 00:00:00 2001
From: Xidorn Quan <me@upsuper.org>
Date: Wed, 12 Apr 2017 17:11:22 +0800
Subject: [PATCH 1/3] Add prefix to middle-with-baseline

---
 components/style/properties/longhand/box.mako.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs
index ffa8c5ebddf..f85da524700 100644
--- a/components/style/properties/longhand/box.mako.rs
+++ b/components/style/properties/longhand/box.mako.rs
@@ -220,7 +220,7 @@ ${helpers.single_keyword("position", "static absolute relative fixed",
     <% vertical_align = data.longhands_by_name["vertical-align"] %>
     <% vertical_align.keyword = Keyword("vertical-align",
                                         "baseline sub super top text-top middle bottom text-bottom",
-                                        extra_gecko_values="middle-with-baseline") %>
+                                        extra_gecko_values="-moz-middle-with-baseline") %>
     <% vertical_align_keywords = vertical_align.keyword.values_for(product) %>
 
     ${helpers.gecko_keyword_conversion(vertical_align.keyword)}

From 0da416f24307d64c713f17b264ea594ae838ec0e Mon Sep 17 00:00:00 2001
From: Xidorn Quan <me@upsuper.org>
Date: Wed, 12 Apr 2017 17:38:37 +0800
Subject: [PATCH 2/3] Add white-space: -moz-pre-space for geckolib

---
 components/style/properties/longhand/inherited_text.mako.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/style/properties/longhand/inherited_text.mako.rs b/components/style/properties/longhand/inherited_text.mako.rs
index 07054fbbd56..d9fdfa20755 100644
--- a/components/style/properties/longhand/inherited_text.mako.rs
+++ b/components/style/properties/longhand/inherited_text.mako.rs
@@ -664,6 +664,7 @@ ${helpers.single_keyword("text-align-last",
 
 <%helpers:single_keyword_computed name="white-space"
                                   values="normal pre nowrap pre-wrap pre-line"
+                                  extra_gecko_values="-moz-pre-space"
                                   gecko_constant_prefix="NS_STYLE_WHITESPACE"
                                   needs_conversion="True"
                                   animation_type="none"
@@ -673,6 +674,7 @@ ${helpers.single_keyword("text-align-last",
     impl ComputedValueAsSpecified for SpecifiedValue {}
     no_viewport_percentage!(SpecifiedValue);
 
+    % if product != "gecko":
     impl SpecifiedValue {
         pub fn allow_wrap(&self) -> bool {
             match *self {
@@ -704,6 +706,7 @@ ${helpers.single_keyword("text-align-last",
             }
         }
     }
+    % endif
 </%helpers:single_keyword_computed>
 
 <%helpers:longhand name="text-shadow" animation_type="normal"

From 0df16cb22cca3b86216a3fd160da5d5cc4eee66d Mon Sep 17 00:00:00 2001
From: Xidorn Quan <me@upsuper.org>
Date: Wed, 12 Apr 2017 17:49:34 +0800
Subject: [PATCH 3/3] Support stroke-dasharray: none

This should fix #16374.
---
 components/style/properties/longhand/inherited_svg.mako.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/style/properties/longhand/inherited_svg.mako.rs b/components/style/properties/longhand/inherited_svg.mako.rs
index 2d051590b62..721b3fa921b 100644
--- a/components/style/properties/longhand/inherited_svg.mako.rs
+++ b/components/style/properties/longhand/inherited_svg.mako.rs
@@ -97,6 +97,7 @@ ${helpers.predefined_type("stroke-dasharray",
                           "Either::Second(0.0)",
                           "parse_non_negative",
                           vector="True",
+                          allow_empty="True",
                           products="gecko",
                           animation_type="none",
                           space_separated_allowed="True",