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

Filter abs-pos children and sort by 'order' field

Browse source 
As the flexbox spec change in May 2016, the absolutely positioned
children painting order no longer follow the `order` property, thus we
can simply filter them out.

Also sort items by the order field of 'FlexItem', no longer do two
vtable lookups in each compare.
This commit is contained in:
Pu Xingyu 2016-07-20 16:55:44 +08:00
parent 196d19a311
commit 05cf52cb0b
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/layout/flex.rs
View file

@ -712,19 +712,14 @@ impl Flow for FlexFlow {
// Flexbox Section 9.0: Generate anonymous flex items:
// This part was handled in the flow constructor.
// Flexbox Section 9.1: Re-order the flex items (and any absolutely positioned flex
// container children) according to their order.
let mut items = self.block_flow.base.children.iter_flow_ref_mut().map(|flow| {
FlexItem::new(flow.clone())
}).collect::<Vec<FlexItem>>();
items.sort_by(|item1, item2| {
item1.flow.as_block().fragment.style.get_position().order.cmp(
&item2.flow.as_block().fragment.style.get_position().order
)
});
// Flexbox Section 9.1: Re-order flex items according to their order.
// FIXME(stshine): This should be done during flow construction.
let mut items = self.block_flow.base.children.iter_flow_ref_mut()
.filter(|flow| !flow.as_block().base.flags.contains(IS_ABSOLUTELY_POSITIONED))
.map(|flow| FlexItem::new(flow.clone()))
.collect::<Vec<FlexItem>>();
items.sort_by_key(|item| item.order);
self.items = items;
match self.main_mode {