Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Background follow ups #25594

Merged
merged 10 commits into from Jan 25, 2020

Rename `clipping_area` to `painting_area`

  • Loading branch information
SimonSapin committed Jan 24, 2020
commit 9fedade3965f224ccb04ba8b69b721a11bcef3ce
@@ -38,7 +38,7 @@ pub(super) fn layout_layer(
) -> Option<Layer> {
let b = fragment_builder.fragment.style.get_background();

let clipping_area = match get_cyclic(&b.background_clip.0, layer_index) {
let painting_area = match get_cyclic(&b.background_clip.0, layer_index) {
Clip::ContentBox => fragment_builder.content_rect(),
Clip::PaddingBox => fragment_builder.padding_rect(),
Clip::BorderBox => &fragment_builder.border_rect,
@@ -132,17 +132,17 @@ pub(super) fn layout_layer(
&mut tile_spacing.width,
repeat_x,
get_cyclic(&b.background_position_x.0, layer_index),
clipping_area.origin.x - positioning_area.origin.x,
clipping_area.size.width,
painting_area.origin.x - positioning_area.origin.x,
painting_area.size.width,
positioning_area.size.width,
);
let result_y = layout_1d(
&mut tile_size.height,
&mut tile_spacing.height,
repeat_y,
get_cyclic(&b.background_position_y.0, layer_index),
clipping_area.origin.y - positioning_area.origin.y,
clipping_area.size.height,
painting_area.origin.y - positioning_area.origin.y,
painting_area.size.height,
positioning_area.size.height,
);
let bounds = units::LayoutRect::new(
@@ -151,7 +151,7 @@ pub(super) fn layout_layer(
);

// The 'backgound-clip' property maps directly to `clip_rect` in `CommonItemProperties`:
let mut common = builder.common_properties(*clipping_area);
let mut common = builder.common_properties(*painting_area);
fragment_builder.with_border_edge_clip(builder, &mut common);

Some(Layer {
@@ -170,8 +170,8 @@ fn layout_1d(
tile_spacing: &mut f32,
mut repeat: Repeat,
position: &LengthPercentage,
clipping_area_origin: f32,
clipping_area_size: f32,
painting_area_origin: f32,
painting_area_size: f32,
positioning_area_size: f32,
) -> Layout1DResult {
// https://drafts.csswg.org/css-backgrounds/#background-repeat
@@ -214,9 +214,9 @@ fn layout_1d(
// * Its bottom-right is the bottom-right of `clip_rect`
// * Its top-left is the top-left of first tile.
let tile_stride = *tile_size + *tile_spacing;
let offset = position - clipping_area_origin;
let offset = position - painting_area_origin;
let bounds_origin = position - tile_stride * (offset / tile_stride).ceil();
let bounds_size = clipping_area_size - bounds_origin - clipping_area_origin;
let bounds_size = painting_area_size - bounds_origin - painting_area_origin;
Layout1DResult {
repeat: true,
bounds_origin,
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.