Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

stylo: Correct computed value of mask-image.

Browse source
This commit is contained in:
cku 2017-04-11 16:44:44 +08:00
parent ca3cd64d6b
commit 10c8dbdefd
2 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/properties/gecko.mako.rs
View file

@ -2374,8 +2374,8 @@ fn static_assert() {
% else: % else:
use properties::longhands::mask_image::single_value::computed_value::T; use properties::longhands::mask_image::single_value::computed_value::T;
match image { match image {
T::Image(image) => geckoimage.mImage.set(image, false, cacheable), T::Image(image) => geckoimage.mImage.set(image, true, cacheable),
_ => () // we need to support url valeus _ => ()
} }
% endif % endif

14
components/style/properties/longhand/svg.mako.rs
View file

@ -218,7 +218,6 @@ ${helpers.single_keyword("mask-composite",
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub enum T { pub enum T {
Image(computed::Image), Image(computed::Image),
Url(SpecifiedUrl),
None None
} }
@ -227,7 +226,6 @@ ${helpers.single_keyword("mask-composite",
match *self { match *self {
T::None => dest.write_str("none"), T::None => dest.write_str("none"),
T::Image(ref image) => image.to_css(dest), 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))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub enum SpecifiedValue { pub enum SpecifiedValue {
Image(Image), Image(Image),
Url(SpecifiedUrl),
None None
} }
@ -247,7 +244,6 @@ ${helpers.single_keyword("mask-composite",
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self { match *self {
SpecifiedValue::Image(ref image) => image.to_css(dest), SpecifiedValue::Image(ref image) => image.to_css(dest),
SpecifiedValue::Url(ref url) => url.to_css(dest),
SpecifiedValue::None => dest.write_str("none"), SpecifiedValue::None => dest.write_str("none"),
} }
} }
@ -268,11 +264,7 @@ ${helpers.single_keyword("mask-composite",
let image = try!(Image::parse(context, input)); let image = try!(Image::parse(context, input));
match image { match image {
Image::Url(url_value) => { Image::Url(url_value) => {
if url_value.is_fragment() { Ok(SpecifiedValue::Image(Image::Url(url_value)))
Ok(SpecifiedValue::Url(url_value))
} else {
Ok(SpecifiedValue::Image(Image::Url(url_value)))
}
} }
image => Ok(SpecifiedValue::Image(image)) image => Ok(SpecifiedValue::Image(image))
} }
@ -287,8 +279,6 @@ ${helpers.single_keyword("mask-composite",
SpecifiedValue::None => computed_value::T::None, SpecifiedValue::None => computed_value::T::None,
SpecifiedValue::Image(ref image) => SpecifiedValue::Image(ref image) =>
computed_value::T::Image(image.to_computed_value(context)), 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::None => SpecifiedValue::None,
computed_value::T::Image(ref image) => computed_value::T::Image(ref image) =>
SpecifiedValue::Image(ToComputedValue::from_computed_value(image)), SpecifiedValue::Image(ToComputedValue::from_computed_value(image)),
computed_value::T::Url(ref url) =>
SpecifiedValue::Url(url.clone()),
} }
} }
} }