diff options
| author | Mauricio Collares <mau@ric.io> | 2016-04-04 21:27:52 -0300 |
|---|---|---|
| committer | Mauricio Collares <mau@ric.io> | 2016-04-04 21:36:51 -0300 |
| commit | 4f0558e84f68048c835263bf1d718711102dfdd5 (patch) | |
| tree | 01bb302931ded70fcb6cdd47e66b7fa27e00d585 | |
| parent | b568b72d760623462fe1a19544e1ad59f98e4480 (diff) | |
| download | servo-4f0558e84f68048c835263bf1d718711102dfdd5.tar.gz servo-4f0558e84f68048c835263bf1d718711102dfdd5.zip | |
Move CSS image-rendering property from Effects to InheritedBox
| -rw-r--r-- | components/layout/display_list_builder.rs | 4 | ||||
| -rw-r--r-- | components/layout/incremental.rs | 2 | ||||
| -rw-r--r-- | components/style/properties.mako.rs | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index e6034bb29ab..73b747d82dc 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -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); } } diff --git a/components/layout/incremental.rs b/components/layout/incremental.rs index df63fa43af4..6433c84ac02 100644 --- a/components/layout/incremental.rs +++ b/components/layout/incremental.rs @@ -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 diff --git a/components/style/properties.mako.rs b/components/style/properties.mako.rs index 0b9dcd11217..fe9d654e592 100644 --- a/components/style/properties.mako.rs +++ b/components/style/properties.mako.rs @@ -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 { |