Bug 1388220 - Convert gecko's currentcolor to servo one. r?xidorn
MozReview-Commit-ID: DmTjXeeaJ7M
--- a/servo/components/style/gecko_bindings/sugar/ns_css_shadow_item.rs
+++ b/servo/components/style/gecko_bindings/sugar/ns_css_shadow_item.rs
@@ -43,19 +43,28 @@ impl nsCSSShadowItem {
self.mHasColor = false;
self.mColor = 0;
} else {
self.mHasColor = true;
self.mColor = convert_rgba_to_nscolor(&shadow.color.color);
}
}
+ #[inline]
+ fn extract_color(&self) -> Color {
+ if self.mHasColor {
+ Color::rgba(convert_nscolor_to_rgba(self.mColor))
+ } else {
+ Color::currentcolor()
+ }
+ }
+
/// Returns this item as a simple shadow.
#[inline]
pub fn to_simple_shadow(&self) -> SimpleShadow {
SimpleShadow {
- color: Color::rgba(convert_nscolor_to_rgba(self.mColor)),
+ color: self.extract_color(),
horizontal: Au(self.mXOffset),
vertical: Au(self.mYOffset),
blur: Au(self.mRadius).into(),
}
}
}