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

Auto merge of #16956 - mbrubeck:cleanup, r=Manishearth

Browse source 
stylo: Use correct counts when copying from image layers.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they are code cleanup.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16956)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-21 14:09:52 -05:00 • committed by GitHub
commit 460c90af8d
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2769,19 +2769,18 @@ fn static_assert() {
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; use gecko_bindings::structs::nsStyleImageLayers_LayerType as LayerType;
let count = other.gecko.${image_layers_field}.${field_name}Count;
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(), count as usize,
LayerType::${shorthand.title()}); 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())
.take(other.gecko.${image_layers_field} .take(count as usize) {
.${field_name}Count as usize) {
layer.${field_name} = other.${field_name}; layer.${field_name} = other.${field_name};
} }
self.gecko.${image_layers_field}.${field_name}Count = self.gecko.${image_layers_field}.${field_name}Count = count;
other.gecko.${image_layers_field}.${field_name}Count;
} }
@ -2874,23 +2873,21 @@ fn static_assert() {
pub fn copy_${shorthand}_position_${orientation}_from(&mut self, other: &Self) { pub fn copy_${shorthand}_position_${orientation}_from(&mut self, other: &Self) {
use gecko_bindings::structs::nsStyleImageLayers_LayerType as LayerType; use gecko_bindings::structs::nsStyleImageLayers_LayerType as LayerType;
self.gecko.${image_layers_field}.mPosition${orientation.upper()}Count let count = other.gecko.${image_layers_field}.mPosition${orientation.upper()}Count;
= cmp::min(1, other.gecko.${image_layers_field}.mPosition${orientation.upper()}Count);
self.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(), count as usize,
LayerType::${shorthand.capitalize()}); LayerType::${shorthand.capitalize()});
} }
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())
.take(count as usize) {
layer.mPosition.m${orientation.upper()}Position layer.mPosition.m${orientation.upper()}Position
= other.mPosition.m${orientation.upper()}Position; = other.mPosition.m${orientation.upper()}Position;
} }
self.gecko.${image_layers_field}.mPosition${orientation.upper()}Count self.gecko.${image_layers_field}.mPosition${orientation.upper()}Count = count;
= other.gecko.${image_layers_field}.mPosition${orientation.upper()}Count;
} }
pub fn clone_${shorthand}_position_${orientation}(&self) pub fn clone_${shorthand}_position_${orientation}(&self)