From 10c8dbdefd3caf60ebd4975b356a89296cf653ea Mon Sep 17 00:00:00 2001
From: cku <cku@mozilla.com>
Date: Tue, 11 Apr 2017 16:44:44 +0800
Subject: [PATCH] stylo: Correct computed value of mask-image.

---
 components/style/properties/gecko.mako.rs        |  4 ++--
 components/style/properties/longhand/svg.mako.rs | 14 +-------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs
index ff3529bb53b..d461f220113 100644
--- a/components/style/properties/gecko.mako.rs
+++ b/components/style/properties/gecko.mako.rs
@@ -2374,8 +2374,8 @@ fn static_assert() {
             % else:
                 use properties::longhands::mask_image::single_value::computed_value::T;
                 match image {
-                    T::Image(image) => geckoimage.mImage.set(image, false, cacheable),
-                    _ => () // we need to support url valeus
+                    T::Image(image) => geckoimage.mImage.set(image, true, cacheable),
+                    _ => ()
                 }
             % endif
 
diff --git a/components/style/properties/longhand/svg.mako.rs b/components/style/properties/longhand/svg.mako.rs
index 070805db75c..7de3b078690 100644
--- a/components/style/properties/longhand/svg.mako.rs
+++ b/components/style/properties/longhand/svg.mako.rs
@@ -218,7 +218,6 @@ ${helpers.single_keyword("mask-composite",
         #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
         pub enum T {
             Image(computed::Image),
-            Url(SpecifiedUrl),
             None
         }
 
@@ -227,7 +226,6 @@ ${helpers.single_keyword("mask-composite",
                 match *self {
                     T::None => dest.write_str("none"),
                     T::Image(ref image) => image.to_css(dest),
-                    T::Url(ref url) => url.to_css(dest),
                 }
             }
         }
@@ -239,7 +237,6 @@ ${helpers.single_keyword("mask-composite",
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub enum SpecifiedValue {
         Image(Image),
-        Url(SpecifiedUrl),
         None
     }
 
@@ -247,7 +244,6 @@ ${helpers.single_keyword("mask-composite",
         fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
             match *self {
                 SpecifiedValue::Image(ref image) => image.to_css(dest),
-                SpecifiedValue::Url(ref url) => url.to_css(dest),
                 SpecifiedValue::None => dest.write_str("none"),
             }
         }
@@ -268,11 +264,7 @@ ${helpers.single_keyword("mask-composite",
             let image = try!(Image::parse(context, input));
             match image {
                 Image::Url(url_value) => {
-                    if url_value.is_fragment() {
-                        Ok(SpecifiedValue::Url(url_value))
-                    } else {
-                        Ok(SpecifiedValue::Image(Image::Url(url_value)))
-                    }
+                    Ok(SpecifiedValue::Image(Image::Url(url_value)))
                 }
                 image => Ok(SpecifiedValue::Image(image))
             }
@@ -287,8 +279,6 @@ ${helpers.single_keyword("mask-composite",
                 SpecifiedValue::None => computed_value::T::None,
                 SpecifiedValue::Image(ref image) =>
                     computed_value::T::Image(image.to_computed_value(context)),
-                SpecifiedValue::Url(ref url) =>
-                    computed_value::T::Url(url.clone()),
             }
         }
 
@@ -298,8 +288,6 @@ ${helpers.single_keyword("mask-composite",
                 computed_value::T::None => SpecifiedValue::None,
                 computed_value::T::Image(ref image) =>
                     SpecifiedValue::Image(ToComputedValue::from_computed_value(image)),
-                computed_value::T::Url(ref url) =>
-                    SpecifiedValue::Url(url.clone()),
             }
         }
     }