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

Box gradients and rects in Image. r=xidorn

Browse source 
Gradients and rects are rare, and large.  Image is much smaller with them boxed.

This is part of of the fix for Gecko bug 1397614
<https://bugzilla.mozilla.org/show_bug.cgi?id=1397614>
This commit is contained in:
Boris Zbarsky 2017-09-09 04:31:25 -04:00
parent 91b748ec22
commit 26b39241f9
4 changed files with 65 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,8 +151,8 @@ impl nsStyleImage {
/// Set a given Servo `Image` value into this `nsStyleImage`.
pub fn set(&mut self, image: Image) {
match image {
GenericImage::Gradient(gradient) => {
self.set_gradient(gradient)
GenericImage::Gradient(boxed_gradient) => {
self.set_gradient(*boxed_gradient)
},
GenericImage::Url(ref url) => {
unsafe {
@ -399,7 +399,7 @@ impl nsStyleImage {
NumberOrPercentage::from_gecko_style_coord(&rect.data_at(2)),
NumberOrPercentage::from_gecko_style_coord(&rect.data_at(3))) {
(Some(top), Some(right), Some(bottom), Some(left)) =>
Some(GenericImage::Rect(MozImageRect { url, top, right, bottom, left } )),
Some(GenericImage::Rect(Box::new(MozImageRect { url, top, right, bottom, left } ))),
_ => {
debug_assert!(false, "mCropRect could not convert to NumberOrPercentage");
None
@ -428,7 +428,7 @@ impl nsStyleImage {
url
}
unsafe fn get_gradient(self: &nsStyleImage) -> Gradient {
unsafe fn get_gradient(self: &nsStyleImage) -> Box<Gradient> {
use gecko::values::convert_nscolor_to_rgba;
use gecko_bindings::bindings::Gecko_GetGradientImageValue;
use gecko_bindings::structs::{NS_STYLE_GRADIENT_SHAPE_CIRCULAR, NS_STYLE_GRADIENT_SHAPE_ELLIPTICAL};
@ -581,7 +581,7 @@ impl nsStyleImage {
CompatMode::Modern
};
Gradient { items, repeating: gecko_gradient.mRepeating, kind, compat_mode }
Box::new(Gradient { items, repeating: gecko_gradient.mRepeating, kind, compat_mode })
}
}