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

Simplify CommonItemProperties construction

Browse source
This commit is contained in:
Simon Sapin 2020-01-09 17:35:45 +01:00
parent 12c18a0e07
commit 87b79985fa
1 changed files with 23 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

52
components/layout_2020/display_list.rs
View file

@ -39,24 +39,12 @@ impl DisplayListBuilder {
} }
fn common_properties(&self, clip_rect: units::LayoutRect) -> wr::CommonItemProperties { fn common_properties(&self, clip_rect: units::LayoutRect) -> wr::CommonItemProperties {
self.common_properties_with_hit_info(clip_rect, None)
}
fn common_properties_with_hit_info(
&self,
clip_rect: units::LayoutRect,
hit_info: HitInfo,
) -> wr::CommonItemProperties {
wr::CommonItemProperties {
clip_rect,
clip_id: self.current_space_and_clip.clip_id,
spatial_id: self.current_space_and_clip.spatial_id,
hit_info,
// TODO(gw): Make use of the WR backface visibility functionality. // TODO(gw): Make use of the WR backface visibility functionality.
flags: wr::PrimitiveFlags::default(), wr::CommonItemProperties::new(clip_rect, self.current_space_and_clip)
}
} }
// FIXME: use this for the `overflow` property or anything else that clips an entire subtree.
#[allow(unused)]
fn clipping_and_scrolling_scope<R>(&mut self, f: impl FnOnce(&mut Self) -> R) -> R { fn clipping_and_scrolling_scope<R>(&mut self, f: impl FnOnce(&mut Self) -> R) -> R {
let previous = self.current_space_and_clip; let previous = self.current_space_and_clip;
let result = f(self); let result = f(self);
@ -96,8 +84,8 @@ impl Fragment {
if glyphs.is_empty() { if glyphs.is_empty() {
return; return;
} }
let hit_info = hit_info(&t.parent_style, t.tag, Cursor::Text); let mut common = builder.common_properties(rect.clone().into());
let common = builder.common_properties_with_hit_info(rect.clone().into(), hit_info); common.hit_info = hit_info(&t.parent_style, t.tag, Cursor::Text);
let color = t.parent_style.clone_color(); let color = t.parent_style.clone_color();
builder builder
.wr .wr
@ -173,10 +161,14 @@ impl<'a> BuilderForBoxFragment<'a> {
} }
} }
fn border_edge_clip_id(&mut self, builder: &mut DisplayListBuilder) -> Option<wr::ClipId> { fn with_border_edge_clip(
&mut self,
builder: &mut DisplayListBuilder,
common: &mut wr::CommonItemProperties,
) {
let border_radius = &self.border_radius; let border_radius = &self.border_radius;
let border_rect = &self.border_rect; let border_rect = &self.border_rect;
*self.border_edge_clip_id.get_or_insert_with(|| { let initialized = self.border_edge_clip_id.get_or_insert_with(|| {
if border_radius.is_zero() { if border_radius.is_zero() {
None None
} else { } else {
@ -191,19 +183,19 @@ impl<'a> BuilderForBoxFragment<'a> {
None, None,
)) ))
} }
}) });
if let Some(clip_id) = *initialized {
common.clip_id = clip_id
}
} }
fn build(&mut self, builder: &mut DisplayListBuilder, containing_block: &Rect<Length>) { fn build(&mut self, builder: &mut DisplayListBuilder, containing_block: &Rect<Length>) {
let hit_info = hit_info(&self.fragment.style, self.fragment.tag, Cursor::Default); let hit_info = hit_info(&self.fragment.style, self.fragment.tag, Cursor::Default);
if hit_info.is_some() { if hit_info.is_some() {
builder.clipping_and_scrolling_scope(|builder| { let mut common = builder.common_properties(self.border_rect);
if let Some(id) = self.border_edge_clip_id(builder) { common.hit_info = hit_info;
builder.current_space_and_clip.clip_id = id self.with_border_edge_clip(builder, &mut common);
}
let common = builder.common_properties_with_hit_info(self.border_rect, hit_info);
builder.wr.push_hit_test(&common) builder.wr.push_hit_test(&common)
})
} }
self.background_display_items(builder); self.background_display_items(builder);
@ -224,13 +216,9 @@ impl<'a> BuilderForBoxFragment<'a> {
.style .style
.resolve_color(self.fragment.style.clone_background_color()); .resolve_color(self.fragment.style.clone_background_color());
if background_color.alpha > 0 { if background_color.alpha > 0 {
builder.clipping_and_scrolling_scope(|builder| { let mut common = builder.common_properties(self.border_rect);
if let Some(id) = self.border_edge_clip_id(builder) { self.with_border_edge_clip(builder, &mut common);
builder.current_space_and_clip.clip_id = id
}
let common = builder.common_properties(self.border_rect);
builder.wr.push_rect(&common, rgba(background_color)) builder.wr.push_rect(&common, rgba(background_color))
});
} }
} }