From 51850c7ab6129ab36fed99e45bdd4e45660348c6 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Tue, 9 Dec 2014 15:50:18 -0800
Subject: [PATCH 1/2] Remove unused code in assign_block_size_block_base

This code is unreachable because an earlier `if base(kid).flags.is_float()`
check bails out of the loop before it can reach this block.
---
 components/layout/block.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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);

From 5d0d11c380461302cd32b6b202e742116be7c598 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Tue, 9 Dec 2014 15:57:05 -0800
Subject: [PATCH 2/2] Make all of LineBreaker private

---
 components/layout/inline.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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<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());