diff options
| -rw-r--r-- | components/layout_2020/flow/root.rs | 58 |
1 files changed, 25 insertions, 33 deletions
diff --git a/components/layout_2020/flow/root.rs b/components/layout_2020/flow/root.rs index 858cd44e085..e09a6676f30 100644 --- a/components/layout_2020/flow/root.rs +++ b/components/layout_2020/flow/root.rs @@ -204,52 +204,44 @@ impl FragmentTreeRoot { where F: FnMut(&Fragment, &PhysicalRect<Length>) -> bool, { - fn do_iteration<M>( - fragment: &Fragment, + fn recur<M>( + fragments: &[Fragment], containing_block: &PhysicalRect<Length>, process_func: &mut M, ) -> bool where M: FnMut(&Fragment, &PhysicalRect<Length>) -> bool, { - if !process_func(fragment, containing_block) { - return false; - } - - match fragment { - Fragment::Box(fragment) => { - let new_containing_block = fragment - .content_rect - .to_physical(fragment.style.writing_mode, containing_block) - .translate(containing_block.origin.to_vector()); - for child in &fragment.children { - if !do_iteration(child, &new_containing_block, process_func) { + for fragment in fragments { + if !process_func(fragment, containing_block) { + return false; + } + + match fragment { + Fragment::Box(fragment) => { + let new_containing_block = fragment + .content_rect + .to_physical(fragment.style.writing_mode, containing_block) + .translate(containing_block.origin.to_vector()); + if !recur(&fragment.children, &new_containing_block, process_func) { return false; } - } - }, - Fragment::Anonymous(fragment) => { - let new_containing_block = fragment - .rect - .to_physical(fragment.mode, containing_block) - .translate(containing_block.origin.to_vector()); - for child in &fragment.children { - if !do_iteration(child, &new_containing_block, process_func) { + }, + Fragment::Anonymous(fragment) => { + let new_containing_block = fragment + .rect + .to_physical(fragment.mode, containing_block) + .translate(containing_block.origin.to_vector()); + if !recur(&fragment.children, &new_containing_block, process_func) { return false; } - } - }, - _ => {}, + }, + _ => {}, + } } - true } - - for child in &self.children { - if !do_iteration(child, &self.initial_containing_block, process_func) { - break; - } - } + recur(&self.children, &self.initial_containing_block, process_func); } pub fn get_content_box_for_node(&self, requested_node: OpaqueNode) -> Rect<Au> { |