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

layout: Stop rebuilding all inline-block flows unconditionally, and

Browse source 
bubble intrinsic inline sizes as necessary when doing incremental
reflow.
This commit is contained in:
Patrick Walton 2015-03-27 19:04:04 -07:00
parent ba0d28e002
commit 4011291bf2
2 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
components/layout/construct.rs
View file

@ -19,7 +19,7 @@ use css::node_style::StyledNode;
use data::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper};
use floats::FloatKind;
use flow::{Descendants, AbsDescendants};
use flow::{Flow, ImmutableFlowUtils, MutableOwnedFlowUtils};
use flow::{Flow, ImmutableFlowUtils, MutableFlowUtils, MutableOwnedFlowUtils};
use flow::{IS_ABSOLUTELY_POSITIONED};
use flow;
use flow_ref::FlowRef;
@ -85,6 +85,8 @@ impl ConstructionResult {
return mem::replace(self, ConstructionResult::None)
}
// FIXME(pcwalton): Stop doing this with inline fragments. Cloning fragments is very
// inefficient!
(*self).clone()
}
@ -1164,7 +1166,30 @@ impl<'a> FlowConstructor<'a> {
// The node's flow is of the same type and has the same set of children and can
// therefore be repaired by simply propagating damage and style to the flow.
flow::mut_base(&mut *flow).restyle_damage.insert(node.restyle_damage());
flow.repair_style(node.style());
flow.repair_style_and_bubble_inline_sizes(node.style());
true
}
ConstructionResult::ConstructionItem(ConstructionItem::InlineFragments(
mut inline_fragments_construction_result)) => {
if !inline_fragments_construction_result.splits.is_empty() {
return false
}
let damage = node.restyle_damage();
for fragment in inline_fragments_construction_result.fragments.iter_mut() {
match fragment.specific {
SpecificFragmentInfo::InlineBlock(ref mut inline_block_fragment) => {
flow::mut_base(&mut *inline_block_fragment.flow_ref).restyle_damage
.insert(damage);
// FIXME(pcwalton): Fragment restyle damage too?
inline_block_fragment.flow_ref.repair_style_and_bubble_inline_sizes(
node.style());
}
_ => {
return false
}
}
}
true
}
ConstructionResult::ConstructionItem(_) => {