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

Avoid initializing image layers after repeat/origin values have been written.

Browse source 
MozReview-Commit-ID: LeetT5lKKKB
This commit is contained in:
Cameron McCormack 2016-10-11 11:01:55 +08:00
parent c50402946b
commit 1a24469398
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ use gecko_bindings::bindings::{Gecko_SetNullImageValue, Gecko_SetGradientImageVa
use gecko_bindings::bindings::{Gecko_EnsureImageLayersLength, Gecko_CreateGradient}; use gecko_bindings::bindings::{Gecko_EnsureImageLayersLength, Gecko_CreateGradient};
use gecko_bindings::bindings::{Gecko_CopyImageValueFrom, Gecko_CopyFontFamilyFrom}; use gecko_bindings::bindings::{Gecko_CopyImageValueFrom, Gecko_CopyFontFamilyFrom};
use gecko_bindings::bindings::{Gecko_FontFamilyList_AppendGeneric, Gecko_FontFamilyList_AppendNamed}; use gecko_bindings::bindings::{Gecko_FontFamilyList_AppendGeneric, Gecko_FontFamilyList_AppendNamed};
use gecko_bindings::bindings::{Gecko_FontFamilyList_Clear, Gecko_InitializeImageLayer}; use gecko_bindings::bindings::{Gecko_FontFamilyList_Clear};
use gecko_bindings::bindings::ServoComputedValuesBorrowedOrNull; use gecko_bindings::bindings::ServoComputedValuesBorrowedOrNull;
use gecko_bindings::structs; use gecko_bindings::structs;
use gecko_bindings::sugar::ns_style_coord::{CoordDataValue, CoordData, CoordDataMut}; use gecko_bindings::sugar::ns_style_coord::{CoordDataValue, CoordData, CoordDataMut};
@ -949,9 +949,12 @@ fn static_assert() {
image_layers_field = "mImage" if shorthand == "background" else "mMask" image_layers_field = "mImage" if shorthand == "background" else "mMask"
%> %>
pub fn copy_${shorthand}_${name}_from(&mut self, other: &Self) { pub fn copy_${shorthand}_${name}_from(&mut self, other: &Self) {
use gecko_bindings::structs::nsStyleImageLayers_LayerType as LayerType;
unsafe { unsafe {
Gecko_EnsureImageLayersLength(&mut self.gecko.${image_layers_field}, Gecko_EnsureImageLayersLength(&mut self.gecko.${image_layers_field},
other.gecko.${image_layers_field}.mLayers.len()); other.gecko.${image_layers_field}.mLayers.len(),
LayerType::${shorthand.title()});
} }
for (layer, other) in self.gecko.${image_layers_field}.mLayers.iter_mut() for (layer, other) in self.gecko.${image_layers_field}.mLayers.iter_mut()
.zip(other.gecko.${image_layers_field}.mLayers.iter()) .zip(other.gecko.${image_layers_field}.mLayers.iter())
@ -965,8 +968,11 @@ fn static_assert() {
pub fn set_${shorthand}_${name}(&mut self, pub fn set_${shorthand}_${name}(&mut self,
v: longhands::${shorthand}_${name}::computed_value::T) { v: longhands::${shorthand}_${name}::computed_value::T) {
use gecko_bindings::structs::nsStyleImageLayers_LayerType as LayerType;
unsafe { unsafe {
Gecko_EnsureImageLayersLength(&mut self.gecko.${image_layers_field}, v.0.len()); Gecko_EnsureImageLayersLength(&mut self.gecko.${image_layers_field}, v.0.len(),
LayerType::${shorthand.title()});
} }
self.gecko.${image_layers_field}.${field_name}Count = v.0.len() as u32; self.gecko.${image_layers_field}.${field_name}Count = v.0.len() as u32;
@ -1032,6 +1038,8 @@ fn static_assert() {
</%self:simple_image_array_property> </%self:simple_image_array_property>
pub fn copy_${shorthand}_position_from(&mut self, other: &Self) { pub fn copy_${shorthand}_position_from(&mut self, other: &Self) {
use gecko_bindings::structs::nsStyleImageLayers_LayerType as LayerType;
self.gecko.${image_layers_field}.mPositionXCount self.gecko.${image_layers_field}.mPositionXCount
= cmp::min(1, other.gecko.${image_layers_field}.mPositionXCount); = cmp::min(1, other.gecko.${image_layers_field}.mPositionXCount);
self.gecko.${image_layers_field}.mPositionYCount self.gecko.${image_layers_field}.mPositionYCount
@ -1040,7 +1048,8 @@ fn static_assert() {
other.gecko.${image_layers_field}.mLayers.mFirstElement.mPosition; other.gecko.${image_layers_field}.mLayers.mFirstElement.mPosition;
unsafe { unsafe {
Gecko_EnsureImageLayersLength(&mut self.gecko.${image_layers_field}, Gecko_EnsureImageLayersLength(&mut self.gecko.${image_layers_field},
other.gecko.${image_layers_field}.mLayers.len()); other.gecko.${image_layers_field}.mLayers.len(),
LayerType::${shorthand.title()});
} }
for (layer, other) in self.gecko.${image_layers_field}.mLayers.iter_mut() for (layer, other) in self.gecko.${image_layers_field}.mLayers.iter_mut()
.zip(other.gecko.${image_layers_field}.mLayers.iter()) .zip(other.gecko.${image_layers_field}.mLayers.iter())
@ -1077,8 +1086,11 @@ fn static_assert() {
pub fn set_${shorthand}_position(&mut self, pub fn set_${shorthand}_position(&mut self,
v: longhands::${shorthand}_position::computed_value::T) { v: longhands::${shorthand}_position::computed_value::T) {
use gecko_bindings::structs::nsStyleImageLayers_LayerType as LayerType;
unsafe { unsafe {
Gecko_EnsureImageLayersLength(&mut self.gecko.${image_layers_field}, v.0.len()); Gecko_EnsureImageLayersLength(&mut self.gecko.${image_layers_field}, v.0.len(),
LayerType::${shorthand.title()});
} }
self.gecko.${image_layers_field}.mPositionXCount = v.0.len() as u32; self.gecko.${image_layers_field}.mPositionXCount = v.0.len() as u32;
@ -1344,10 +1356,8 @@ fn static_assert() {
Gecko_SetNullImageValue(&mut image.mImage) Gecko_SetNullImageValue(&mut image.mImage)
} }
// XXXManishearth clear mSourceURI for masks // XXXManishearth clear mSourceURI for masks
Gecko_EnsureImageLayersLength(&mut self.gecko.${image_layers_field}, images.0.len()); Gecko_EnsureImageLayersLength(&mut self.gecko.${image_layers_field}, images.0.len(),
for image in &mut self.gecko.${image_layers_field}.mLayers { LayerType::${shorthand.title()});
Gecko_InitializeImageLayer(image, LayerType::${shorthand.title()});
}
} }
self.gecko.${image_layers_field}.mImageCount = images.0.len() as u32; self.gecko.${image_layers_field}.mImageCount = images.0.len() as u32;