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

Fix crash in background building

Browse source 
Always use border_padding and writing_mode from the same fragment.
Mixing them will trigger a debug assertion if the writing modes are different.

Cleanup and use compute_background_clip
This commit is contained in:
Pyfisch 2018-05-05 21:38:51 +02:00
parent 696084863c
commit 596b53d5f8
1 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

40
components/layout/display_list/builder.rs
View file

@ -17,8 +17,9 @@ use context::LayoutContext;
use display_list::ToLayout; use display_list::ToLayout;
use display_list::background::{build_border_radius, build_image_border_details}; use display_list::background::{build_border_radius, build_image_border_details};
use display_list::background::{calculate_border_image_outset, calculate_inner_border_radii}; use display_list::background::{calculate_border_image_outset, calculate_inner_border_radii};
use display_list::background::{compute_background_placement, convert_linear_gradient}; use display_list::background::{compute_background_clip, compute_background_placement};
use display_list::background::{convert_radial_gradient, get_cyclic, simple_normal_border}; use display_list::background::{convert_linear_gradient, convert_radial_gradient, get_cyclic};
use display_list::background::simple_normal_border;
use display_list::items::{BaseDisplayItem, BorderDetails, BorderDisplayItem, BLUR_INFLATION_FACTOR}; use display_list::items::{BaseDisplayItem, BorderDetails, BorderDisplayItem, BLUR_INFLATION_FACTOR};
use display_list::items::{BoxShadowDisplayItem, ClipScrollNode}; use display_list::items::{BoxShadowDisplayItem, ClipScrollNode};
use display_list::items::{ClipScrollNodeIndex, ClipScrollNodeType, ClippingAndScrolling}; use display_list::items::{ClipScrollNodeIndex, ClipScrollNodeType, ClippingAndScrolling};
@ -52,7 +53,6 @@ use std::default::Default;
use std::f32; use std::f32;
use std::mem; use std::mem;
use std::sync::Arc; use std::sync::Arc;
use style::computed_values::background_clip::single_value::T as BackgroundClip;
use style::computed_values::border_style::T as BorderStyle; use style::computed_values::border_style::T as BorderStyle;
use style::computed_values::overflow_x::T as StyleOverflow; use style::computed_values::overflow_x::T as StyleOverflow;
use style::computed_values::pointer_events::T as PointerEvents; use style::computed_values::pointer_events::T as PointerEvents;
@ -840,33 +840,19 @@ impl FragmentDisplayListBuilding for Fragment {
// inefficient. What we really want is something like "nearest ancestor element that // inefficient. What we really want is something like "nearest ancestor element that
// doesn't have a fragment". // doesn't have a fragment".
// 'background-clip' determines the area within which the background is painted.
// http://dev.w3.org/csswg/css-backgrounds-3/#the-background-clip
let mut bounds = *absolute_bounds;
// Quote from CSS Backgrounds and Borders Module Level 3: // Quote from CSS Backgrounds and Borders Module Level 3:
// //
// > The background color is clipped according to the background-clip value associated // > The background color is clipped according to the background-clip value associated
// > with the bottom-most background image layer. // > with the bottom-most background image layer.
let last_background_image_index = background.background_image.0.len() - 1; let last_background_image_index = background.background_image.0.len() - 1;
let color_clip = get_cyclic(&background.background_clip.0, last_background_image_index); let color_clip = *get_cyclic(&background.background_clip.0, last_background_image_index);
let (bounds, border_radii) = compute_background_clip(
// Adjust the clipping region as necessary to account for `border-radius`. color_clip,
let mut border_radii = build_border_radius(absolute_bounds, style.get_border()); *absolute_bounds,
style.logical_border_width().to_physical(style.writing_mode),
match color_clip { self.border_padding.to_physical(self.style.writing_mode),
BackgroundClip::BorderBox => {}, build_border_radius(absolute_bounds, style.get_border()),
BackgroundClip::PaddingBox => { );
let border = style.logical_border_width().to_physical(style.writing_mode);
bounds = bounds.inner_rect(border);
border_radii = calculate_inner_border_radii(border_radii, border);
},
BackgroundClip::ContentBox => {
let border_padding = self.border_padding.to_physical(style.writing_mode);
bounds = bounds.inner_rect(border_padding);
border_radii = calculate_inner_border_radii(border_radii, border_padding);
},
}
state.clipping_and_scrolling_scope(|state| { state.clipping_and_scrolling_scope(|state| {
if !border_radii.is_zero() { if !border_radii.is_zero() {
@ -988,7 +974,7 @@ impl FragmentDisplayListBuilding for Fragment {
absolute_bounds, absolute_bounds,
Some(image), Some(image),
style.logical_border_width().to_physical(style.writing_mode), style.logical_border_width().to_physical(style.writing_mode),
self.border_padding.to_physical(style.writing_mode), self.border_padding.to_physical(self.style.writing_mode),
build_border_radius(&absolute_bounds, style.get_border()), build_border_radius(&absolute_bounds, style.get_border()),
index, index,
); );
@ -1095,7 +1081,7 @@ impl FragmentDisplayListBuilding for Fragment {
absolute_bounds, absolute_bounds,
None, None,
style.logical_border_width().to_physical(style.writing_mode), style.logical_border_width().to_physical(style.writing_mode),
self.border_padding.to_physical(style.writing_mode), self.border_padding.to_physical(self.style.writing_mode),
build_border_radius(&absolute_bounds, style.get_border()), build_border_radius(&absolute_bounds, style.get_border()),
index, index,
); );