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

layout: Largely move display list building out to a separate file.

Browse source 
`layout::fragment` and `layout::block` were getting too big.
This commit is contained in:
Patrick Walton 2014-10-21 21:05:44 -07:00
parent 691e42f7ef
commit 821793351e
13 changed files with 843 additions and 785 deletions
Download patch file Download diff file Expand all files Collapse all files

92
components/layout/flow.rs
View file

@ -54,7 +54,6 @@ use servo_msg::compositor_msg::LayerId;
use servo_util::geometry::Au;
use servo_util::logical_geometry::WritingMode;
use servo_util::logical_geometry::{LogicalRect, LogicalSize};
use servo_util::opts;
use std::mem;
use std::num::Zero;
use std::fmt;
@ -209,6 +208,9 @@ pub trait Flow: fmt::Show + ToString + Sync {
// The default implementation is a no-op.
}
/// Phase 5 of reflow: builds display lists.
fn build_display_list(&mut self, layout_context: &LayoutContext);
/// Returns the direction that this flow clears floats in, if any.
fn float_clearance(&self) -> clear::T {
clear::none
@ -406,9 +408,6 @@ pub trait ImmutableFlowUtils {
/// Dumps the flow tree for debugging, with a prefix to indicate that we're at the given level.
fn dump_with_level(self, level: uint);
/// Print an error when this Flow's display list items are not within its boundaries.
fn validate_display_list_geometry(self);
}
pub trait MutableFlowUtils {
@ -425,9 +424,6 @@ pub trait MutableFlowUtils {
/// Computes the overflow region for this flow.
fn store_overflow(self, _: &LayoutContext);
/// Builds the display lists for this flow.
fn build_display_list(self, layout_context: &LayoutContext);
/// Gathers static block-offsets bubbled up by kids.
///
/// This essentially gives us offsets of all absolutely positioned direct descendants and all
@ -858,6 +854,28 @@ impl BaseFlow {
let p = self as *const _;
p as uint
}
pub fn validate_display_list_geometry(&self) {
let position_with_overflow = self.position.union(&self.overflow);
let bounds = Rect(self.abs_position,
Size2D(position_with_overflow.size.inline,
position_with_overflow.size.block));
for item in self.display_list.iter() {
let paint_bounds = match item.base().bounds.intersection(&item.base().clip_rect) {
None => continue,
Some(rect) => rect,
};
if paint_bounds.is_empty() {
continue;
}
if bounds.union(&paint_bounds) != bounds {
error!("DisplayList item {} outside of Flow overflow ({})", item, paint_bounds);
}
}
}
}
impl<'a> ImmutableFlowUtils for &'a Flow + 'a {
@ -1028,28 +1046,6 @@ impl<'a> ImmutableFlowUtils for &'a Flow + 'a {
kid.dump_with_level(level + 1)
}
}
fn validate_display_list_geometry(self) {
let position_with_overflow = base(self).position.union(&base(self).overflow);
let bounds = Rect(base(self).abs_position,
Size2D(position_with_overflow.size.inline,
position_with_overflow.size.block));
for item in base(self).display_list.iter() {
let paint_bounds = match item.base().bounds.intersection(&item.base().clip_rect) {
None => continue,
Some(rect) => rect,
};
if paint_bounds.is_empty() {
continue;
}
if bounds.union(&paint_bounds) != bounds {
error!("DisplayList item {} outside of Flow overflow ({})", item, paint_bounds);
}
}
}
}
impl<'a> MutableFlowUtils for &'a mut Flow + 'a {
@ -1110,44 +1106,6 @@ impl<'a> MutableFlowUtils for &'a mut Flow + 'a {
mut_base(self).overflow = overflow;
}
/// Push display items for current flow and its descendants onto the appropriate display lists
/// of the given stacking context.
///
/// Arguments:
///
/// * `builder`: The display list builder, which contains information used during the entire
/// display list building pass.
///
/// * `info`: Per-flow display list building information.
fn build_display_list(self, layout_context: &LayoutContext) {
debug!("Flow: building display list");
match self.class() {
BlockFlowClass => self.as_block().build_display_list_block(layout_context),
InlineFlowClass => self.as_inline().build_display_list_inline(layout_context),
TableWrapperFlowClass => {
self.as_table_wrapper().build_display_list_table_wrapper(layout_context)
}
TableFlowClass => self.as_table().build_display_list_table(layout_context),
TableRowGroupFlowClass => {
self.as_table_rowgroup().build_display_list_table_rowgroup(layout_context)
}
TableRowFlowClass => self.as_table_row().build_display_list_table_row(layout_context),
TableCaptionFlowClass => {
self.as_table_caption().build_display_list_table_caption(layout_context)
}
TableCellFlowClass => {
self.as_table_cell().build_display_list_table_cell(layout_context)
}
TableColGroupFlowClass => {
// Nothing to do here, as column groups don't render.
}
}
if opts::get().validate_display_list_geometry {
self.validate_display_list_geometry();
}
}
/// Collect and update static y-offsets bubbled up by kids.
///
/// This would essentially give us offsets of all absolutely positioned