From 9cb76dbf457a7bd95468adecb97406fd1ee329d1 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Tue, 9 Dec 2014 17:01:12 -0700
Subject: [PATCH] servo: Merge #4309 - Simple cleanups in layout code (from
 mbrubeck:float-cleanup); r=pcwalton

r? @SimonSapin or @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: d8a5199ba847bb46733eb4794d0bf93966964499
---
 servo/components/layout/block.rs  |  8 ++------
 servo/components/layout/inline.rs | 18 +++++++++---------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/servo/components/layout/block.rs b/servo/components/layout/block.rs
index a721244d8269..6b141b1e7497 100644
--- a/servo/components/layout/block.rs
+++ b/servo/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/servo/components/layout/inline.rs b/servo/components/layout/inline.rs
index 96421f26cffc..eb069c755bcd 100644
--- a/servo/components/layout/inline.rs
+++ b/servo/components/layout/inline.rs
@@ -169,16 +169,16 @@ enum WrapMode {
 }
 
 struct LineBreaker {
-    pub floats: Floats,
-    pub new_fragments: Vec<Fragment>,
-    pub work_list: RingBuf<Fragment>,
-    pub pending_line: Line,
-    pub lines: Vec<Line>,
-    pub cur_b: Au,  // Current position on the block direction
+    floats: Floats,
+    new_fragments: Vec<Fragment>,
+    work_list: RingBuf<Fragment>,
+    pending_line: Line,
+    lines: Vec<Line>,
+    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());