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

Have ContentBox(es)Queries consult the flow tree

Browse source 
Instead of looking at the display tree, have ContentBox(es)Query consult
the flow tree. This allow optimizing away parts of the display tree
later. To do this we need to be more careful about how we send reflow
requests, only querying the flow tree when possible.

Fixes #3790.
This commit is contained in:
Martin Robinson 2014-10-29 19:02:31 -07:00
parent 1a3ff8739c
commit 2d72f00ccf
19 changed files with 374 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/layout/inline.rs
View file

@ -11,7 +11,8 @@ use floats::{FloatLeft, Floats, PlacementInfo};
use flow::{BaseFlow, FlowClass, Flow, InlineFlowClass, MutableFlowUtils};
use flow;
use fragment::{Fragment, InlineAbsoluteHypotheticalFragment, InlineBlockFragment};
use fragment::{ScannedTextFragment, ScannedTextFragmentInfo, SplitInfo};
use fragment::{FragmentBoundsIterator, ScannedTextFragment, ScannedTextFragmentInfo};
use fragment::SplitInfo;
use incremental::{Reflow, ReflowOutOfFlow};
use layout_debug;
use model::IntrinsicISizesContribution;
@ -1195,15 +1196,10 @@ impl Flow for InlineFlow {
debug!("Flow: building display list for {:u} inline fragments", self.fragments.len());
for fragment in self.fragments.fragments.iter_mut() {
let rel_offset = fragment.relative_position(&self.base
.absolute_position_info
.relative_containing_block_size);
let fragment_position = self.base
.abs_position
.add_size(&rel_offset.to_physical(self.base.writing_mode));
let fragment_origin = self.base.child_fragment_absolute_position(fragment);
fragment.build_display_list(&mut self.base.display_list,
layout_context,
fragment_position,
fragment_origin,
ContentLevel,
&self.base.clip_rect);
match fragment.specific {
@ -1223,6 +1219,15 @@ impl Flow for InlineFlow {
}
fn repair_style(&mut self, _: &Arc<ComputedValues>) {}
fn iterate_through_fragment_bounds(&self, iterator: &mut FragmentBoundsIterator) {
for fragment in self.fragments.fragments.iter() {
if iterator.should_process(fragment) {
let fragment_origin = self.base.child_fragment_absolute_position(fragment);
iterator.process(fragment, fragment.abs_bounds_from_origin(&fragment_origin));
}
}
}
}
impl fmt::Show for InlineFlow {