Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-04 03:58:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use Option<RGBA> for color in shadow

Browse source
This commit is contained in:
Xidorn Quan 2017-08-18 11:48:26 +10:00
parent f6a42ed9c1
commit 4e0b1071e7
5 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/style/gecko_bindings/sugar/ns_css_shadow_item.rs
View file

@ -7,7 +7,7 @@
use app_units::Au;
use gecko::values::{convert_rgba_to_nscolor, convert_nscolor_to_rgba};
use gecko_bindings::structs::nsCSSShadowItem;
use values::computed::Color;
use values::computed::RGBAColor;
use values::computed::effects::{BoxShadow, SimpleShadow};
impl nsCSSShadowItem {
@ -37,23 +37,23 @@ impl nsCSSShadowItem {
self.mRadius = shadow.blur.value();
self.mSpread = 0;
self.mInset = false;
if shadow.color.is_currentcolor() {
if let Some(color) = shadow.color {
self.mHasColor = true;
self.mColor = convert_rgba_to_nscolor(&color);
} else {
// TODO handle currentColor
// https://bugzilla.mozilla.org/show_bug.cgi?id=760345
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 {
fn extract_color(&self) -> Option<RGBAColor> {
if self.mHasColor {
Color::rgba(convert_nscolor_to_rgba(self.mColor))
Some(convert_nscolor_to_rgba(self.mColor))
} else {
Color::currentcolor()
None
}
}