servo: Merge #10406 - Move CSS image-rendering property from Effects to InheritedBox (from mauricioc:issue10404); r=bholley

Fixes #10404

Source-Repo: https://github.com/servo/servo
Source-Revision: 0d0e08638da02922353fb165c4d4f3aff59c2ab0
This commit is contained in:
Mauricio Collares
2016-04-06 01:02:03 +05:00
parent 7a4d0e7568
commit 92336f1f00
3 changed files with 5 additions and 3 deletions

View File

@@ -566,7 +566,7 @@ impl FragmentDisplayListBuilding for Fragment {
webrender_image: webrender_image,
image_data: image_data.map(Arc::new),
stretch_size: Size2D::new(image_size.width, image_size.height),
image_rendering: style.get_effects().image_rendering.clone(),
image_rendering: style.get_inheritedbox().image_rendering.clone(),
}), display_list_section);
}
}
@@ -1206,7 +1206,7 @@ impl FragmentDisplayListBuilding for Fragment {
webrender_image: WebRenderImageInfo::from_image(image),
image_data: Some(Arc::new(image.bytes.clone())),
stretch_size: stacking_relative_content_box.size,
image_rendering: self.style.get_effects().image_rendering.clone(),
image_rendering: self.style.get_inheritedbox().image_rendering.clone(),
}), DisplayListSection::Content);
}
}

View File

@@ -232,7 +232,7 @@ pub fn compute_damage(old: Option<&Arc<ServoComputedValues>>, new: &ServoCompute
get_effects.box_shadow, get_effects.clip, get_effects.text_shadow, get_effects.filter,
get_effects.transform, get_effects.backface_visibility, get_effects.transform_style,
get_effects.transform_origin, get_effects.perspective, get_effects.perspective_origin,
get_effects.mix_blend_mode, get_effects.image_rendering,
get_effects.mix_blend_mode, get_inheritedbox.image_rendering,
// Note: May require REFLOW et al. if `visibility: collapse` is implemented.
get_inheritedbox.visibility

View File

@@ -4270,6 +4270,8 @@ pub mod longhands {
color-burn hard-light soft-light difference exclusion hue
saturation color luminosity""")}
${switch_to_style_struct("InheritedBox")}
<%self:longhand name="image-rendering">
pub mod computed_value {