Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Stylo: Remove the second parameter(with_url) of nsStyleImage::set.

Browse source
This commit is contained in:
cku 2017-04-27 00:06:43 +08:00
parent 53279596db
commit 2f91276280
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/gecko/conversions.rs
View file

@ -101,12 +101,12 @@ impl From<nsStyleCoord_CalcValue> for LengthOrPercentage {
impl nsStyleImage { impl nsStyleImage {
/// Set a given Servo `Image` value into this `nsStyleImage`. /// Set a given Servo `Image` value into this `nsStyleImage`.
pub fn set(&mut self, image: Image, with_url: bool, cacheable: &mut bool) { pub fn set(&mut self, image: Image, cacheable: &mut bool) {
match image { match image {
Image::Gradient(gradient) => { Image::Gradient(gradient) => {
self.set_gradient(gradient) self.set_gradient(gradient)
}, },
Image::Url(ref url) if with_url => { Image::Url(ref url) => {
unsafe { unsafe {
Gecko_SetUrlImageValue(self, url.for_ffi()); Gecko_SetUrlImageValue(self, url.for_ffi());
// We unfortunately must make any url() value uncacheable, since // We unfortunately must make any url() value uncacheable, since
@ -119,7 +119,7 @@ impl nsStyleImage {
*cacheable = false; *cacheable = false;
} }
}, },
Image::ImageRect(ref image_rect) if with_url => { Image::ImageRect(ref image_rect) => {
unsafe { unsafe {
Gecko_SetUrlImageValue(self, image_rect.url.for_ffi()); Gecko_SetUrlImageValue(self, image_rect.url.for_ffi());
Gecko_InitializeImageCropRect(self); Gecko_InitializeImageCropRect(self);
@ -145,8 +145,7 @@ impl nsStyleImage {
unsafe { unsafe {
Gecko_SetImageElement(self, element.as_ptr()); Gecko_SetImageElement(self, element.as_ptr());
} }
}, }
_ => (),
} }
} }

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

@ -944,7 +944,7 @@ fn static_assert() {
} }
if let Some(image) = v.0 { if let Some(image) = v.0 {
self.gecko.mBorderImageSource.set(image, true, &mut false) self.gecko.mBorderImageSource.set(image, &mut false)
} }
} }
@ -2764,12 +2764,12 @@ fn static_assert() {
.mLayers.iter_mut()) { .mLayers.iter_mut()) {
% if shorthand == "background": % if shorthand == "background":
if let Some(image) = image.0 { if let Some(image) = image.0 {
geckoimage.mImage.set(image, true, cacheable) geckoimage.mImage.set(image, cacheable)
} }
% 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, true, cacheable), T::Image(image) => geckoimage.mImage.set(image, cacheable),
_ => () _ => ()
} }
% endif % endif