Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Background positioning with initial values

Browse source
This commit is contained in:
Simon Sapin 2020-01-13 13:59:19 +01:00
parent c6ba6c40b9
commit 252877ac62
1 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

48
components/layout_2020/display_list.rs
View file

@ -6,7 +6,7 @@ use crate::context::LayoutContext;
use crate::fragments::{BoxFragment, Fragment}; use crate::fragments::{BoxFragment, Fragment};
use crate::geom::physical::{Rect, Vec2}; use crate::geom::physical::{Rect, Vec2};
use embedder_traits::Cursor; use embedder_traits::Cursor;
use euclid::{Point2D, SideOffsets2D, Size2D}; use euclid::{Point2D, SideOffsets2D, Size2D, Vector2D};
use gfx::text::glyph::GlyphStore; use gfx::text::glyph::GlyphStore;
use net_traits::image_cache::UsePlaceholder; use net_traits::image_cache::UsePlaceholder;
use std::sync::Arc; use std::sync::Arc;
@ -282,13 +282,27 @@ impl<'a> BuilderForBoxFragment<'a> {
intrinsic_height: u32, intrinsic_height: u32,
key: wr::ImageKey, key: wr::ImageKey,
) { ) {
let clipping_area = self.border_rect; // Our job here would be easier if WebRender’s `RepeatingImageDisplayItem`
let mut common = builder.common_properties(clipping_area); // was “infinitely” repeating in all directions (clipped at `clip_rect`)
self.with_border_edge_clip(builder, &mut common); // and contained a `units::LayoutPoint` that determines the position of an arbitrary tile.
//
// Instead, it contains a `bounds` rectangle and:
//
// * The tiling is clipped to the intersection of `clip_rect` and `bounds`
// * The origin (top-left corner) of `bounds` is the position
// of the “first” (top-left-most) tile.
//
// However the background clipping area may be larger than the positionning area,
// so that first time may not be the one at position (0, 0).
// So we compute `bounds` such that:
//
// * Its bottom-right is the bottom-right of `clip_rect`
// * Its top-left is the top-left of the top-left-most tile that intersects with `clip_rect`
// FIXME: correct positioning // FIXME: background-clip
let _positioning_area = self.padding_rect(); let clipping_area = self.border_rect;
let display_item_bounds = clipping_area; // FIXME: background-origin
let positioning_area = self.padding_rect();
// FIXME: https://drafts.csswg.org/css-images-4/#the-image-resolution // FIXME: https://drafts.csswg.org/css-images-4/#the-image-resolution
let dppx = 1.0; let dppx = 1.0;
@ -297,11 +311,29 @@ impl<'a> BuilderForBoxFragment<'a> {
intrinsic_width as f32 / dppx, intrinsic_width as f32 / dppx,
intrinsic_height as f32 / dppx, intrinsic_height as f32 / dppx,
); );
// FIXME: background-size
// Size of one tile:
let stretch_size = intrinsic_size; let stretch_size = intrinsic_size;
let tile_spacing = units::LayoutSize::zero(); let tile_spacing = units::LayoutSize::zero();
let tile_stride = stretch_size + tile_spacing;
// FIXME: background-position
let positioned_tile_origin = positioning_area.origin;
let offset = positioned_tile_origin - clipping_area.origin;
let first_tile_origin = positioned_tile_origin - Vector2D::new(
tile_stride.width * (offset.x / tile_stride.width).ceil(),
tile_stride.height * (offset.y / tile_stride.height).ceil(),
);
let bounds = units::LayoutRect::from_points(&[first_tile_origin, clipping_area.max()]);
// The 'backgound-clip' property maps directly to `clip_rect` in `CommonItemProperties`:
let mut common = builder.common_properties(clipping_area);
self.with_border_edge_clip(builder, &mut common);
builder.wr.push_repeating_image( builder.wr.push_repeating_image(
&common, &common,
display_item_bounds, bounds,
stretch_size, stretch_size,
tile_spacing, tile_spacing,
image_rendering(self.fragment.style.clone_image_rendering()), image_rendering(self.fragment.style.clone_image_rendering()),