diff --git a/components/layout/block.rs b/components/layout/block.rs index a721244d826..6b141b1e749 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -908,12 +908,8 @@ impl BlockFlow { } // Lay the child out if this was an in-order traversal. - let need_to_process_child_floats = if flow::base(kid).flags.is_float() { - kid.place_float_if_applicable(layout_context); - true - } else { - kid.assign_block_size_for_inorder_child_if_necessary(layout_context) - }; + let need_to_process_child_floats = + kid.assign_block_size_for_inorder_child_if_necessary(layout_context); // Mark flows for layerization if necessary to handle painting order correctly. propagate_layer_flag_from_child(&mut layers_needed_for_descendants, kid); diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 96421f26cff..eb069c755bc 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -169,16 +169,16 @@ enum WrapMode { } struct LineBreaker { - pub floats: Floats, - pub new_fragments: Vec, - pub work_list: RingBuf, - pub pending_line: Line, - pub lines: Vec, - pub cur_b: Au, // Current position on the block direction + floats: Floats, + new_fragments: Vec, + work_list: RingBuf, + pending_line: Line, + lines: Vec, + cur_b: Au, // Current position on the block direction } impl LineBreaker { - pub fn new(float_context: Floats) -> LineBreaker { + fn new(float_context: Floats) -> LineBreaker { LineBreaker { new_fragments: Vec::new(), work_list: RingBuf::new(), @@ -193,7 +193,7 @@ impl LineBreaker { } } - pub fn floats(&mut self) -> Floats { + fn floats(&mut self) -> Floats { self.floats.clone() } @@ -215,7 +215,7 @@ impl LineBreaker { self.pending_line.green_zone = LogicalSize::zero(self.floats.writing_mode) } - pub fn scan_for_lines(&mut self, flow: &mut InlineFlow, layout_context: &LayoutContext) { + fn scan_for_lines(&mut self, flow: &mut InlineFlow, layout_context: &LayoutContext) { self.reset_scanner(); let mut old_fragments = mem::replace(&mut flow.fragments, InlineFragments::new());