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

Make background-image an array for stylo

Browse source
This commit is contained in:
Manish Goregaokar 2016-06-24 16:40:01 +05:30
parent 3a5a56807a
commit 38b57c435d
2 changed files with 69 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/properties/longhand/background.mako.rs
View file

@ -10,7 +10,7 @@ ${helpers.predefined_type("background-color", "CSSColor",
"::cssparser::Color::RGBA(::cssparser::RGBA { red: 0., green: 0., blue: 0., alpha: 0. }) /* transparent */", "::cssparser::Color::RGBA(::cssparser::RGBA { red: 0., green: 0., blue: 0., alpha: 0. }) /* transparent */",
animatable=True)} animatable=True)}
<%helpers:longhand name="background-image" animatable="False"> <%helpers:gecko_autoarray_longhand name="background-image" animatable="False">
use cssparser::ToCss; use cssparser::ToCss;
use std::fmt; use std::fmt;
use values::specified::Image; use values::specified::Image;
@ -70,7 +70,7 @@ ${helpers.predefined_type("background-color", "CSSColor",
} }
} }
} }
</%helpers:longhand> </%helpers:gecko_autoarray_longhand>
<%helpers:longhand name="background-position" animatable="True"> <%helpers:longhand name="background-position" animatable="True">
use cssparser::ToCss; use cssparser::ToCss;

18
ports/geckolib/properties.mako.rs
View file

@ -946,7 +946,7 @@ fn static_assert() {
} }
} }
fn set_background_image(&mut self, image: longhands::background_image::computed_value::T) { fn set_background_image(&mut self, images: longhands::background_image::computed_value::T) {
use gecko_bindings::structs::{NS_STYLE_GRADIENT_SHAPE_LINEAR, NS_STYLE_GRADIENT_SIZE_FARTHEST_CORNER}; use gecko_bindings::structs::{NS_STYLE_GRADIENT_SHAPE_LINEAR, NS_STYLE_GRADIENT_SIZE_FARTHEST_CORNER};
use gecko_bindings::structs::nsStyleCoord; use gecko_bindings::structs::nsStyleCoord;
use style::values::computed::Image; use style::values::computed::Image;
@ -955,10 +955,17 @@ fn static_assert() {
unsafe { unsafe {
// Prevent leaking of the last element we did set // Prevent leaking of the last element we did set
Gecko_SetNullImageValue(&mut self.gecko.mImage.mLayers.mFirstElement.mImage); for image in &mut self.gecko.mImage.mLayers {
Gecko_SetNullImageValue(&mut image.mImage)
}
} }
self.gecko.mImage.mImageCount = cmp::max(1, self.gecko.mImage.mImageCount); self.gecko.mImage.mImageCount = cmp::max(self.gecko.mImage.mLayers.len() as u32,
self.gecko.mImage.mImageCount);
// TODO: pre-grow the nsTArray to the right capacity
// otherwise the below code won't work
for (image, geckoimage) in images.0.into_iter().zip(self.gecko.mImage.mLayers.iter_mut()) {
if let Some(image) = image.0 { if let Some(image) = image.0 {
match image { match image {
Image::LinearGradient(ref gradient) => { Image::LinearGradient(ref gradient) => {
@ -1012,8 +1019,7 @@ fn static_assert() {
} }
unsafe { unsafe {
Gecko_SetGradientImageValue(&mut self.gecko.mImage.mLayers.mFirstElement.mImage, Gecko_SetGradientImageValue(&mut geckoimage.mImage, gecko_gradient);
gecko_gradient);
} }
}, },
Image::Url(_) => { Image::Url(_) => {
@ -1026,6 +1032,8 @@ fn static_assert() {
} }
} }
} }
}
} }
</%self:impl_trait> </%self:impl_trait>