From 4665d6dd15f8970f3072e192a32babb92efd132a Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 15 Aug 2017 15:19:30 +0900
Subject: [PATCH] Reuse to_simple_shadow() for box-shadow as well.

---
 .../sugar/ns_css_shadow_item.rs               | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/components/style/gecko_bindings/sugar/ns_css_shadow_item.rs b/components/style/gecko_bindings/sugar/ns_css_shadow_item.rs
index 0111256d5d1..bb270e6ad64 100644
--- a/components/style/gecko_bindings/sugar/ns_css_shadow_item.rs
+++ b/components/style/gecko_bindings/sugar/ns_css_shadow_item.rs
@@ -23,12 +23,7 @@ impl nsCSSShadowItem {
     #[inline]
     pub fn to_box_shadow(&self) -> BoxShadow {
         BoxShadow {
-            base: SimpleShadow {
-                color: Color::rgba(convert_nscolor_to_rgba(self.mColor)),
-                horizontal: Au(self.mXOffset),
-                vertical: Au(self.mYOffset),
-                blur: Au(self.mRadius).into(),
-            },
+            base: self.extract_simple_shadow(),
             spread: Au(self.mSpread),
             inset: self.mInset,
         }
@@ -53,11 +48,9 @@ impl nsCSSShadowItem {
         }
     }
 
-    /// Returns this item as a simple shadow.
+    /// Gets a simple shadow from this item.
     #[inline]
-    pub fn to_simple_shadow(&self) -> SimpleShadow {
-        debug_assert_eq!(self.mSpread, 0);
-        debug_assert_eq!(self.mInset, false);
+    fn extract_simple_shadow(&self) -> SimpleShadow {
         SimpleShadow {
             color: Color::rgba(convert_nscolor_to_rgba(self.mColor)),
             horizontal: Au(self.mXOffset),
@@ -65,4 +58,12 @@ impl nsCSSShadowItem {
             blur: Au(self.mRadius).into(),
         }
     }
+
+    /// Returns this item as a simple shadow.
+    #[inline]
+    pub fn to_simple_shadow(&self) -> SimpleShadow {
+        debug_assert_eq!(self.mSpread, 0);
+        debug_assert_eq!(self.mInset, false);
+        self.extract_simple_shadow()
+    }
 }