From b2cd35da47ef4fa69ebce9c5c8b97a4a5fc4cc94 Mon Sep 17 00:00:00 2001
From: Samuel Harrington <samuel.l.harrington@gmail.com>
Date: Fri, 29 Apr 2016 20:12:22 -0700
Subject: [PATCH 1/2] Delete dead code from flow.rs

---
 components/layout/flow.rs | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/components/layout/flow.rs b/components/layout/flow.rs
index 79ab2fc2c07..3b4bd29a66b 100644
--- a/components/layout/flow.rs
+++ b/components/layout/flow.rs
@@ -676,12 +676,6 @@ bitflags! {
     }
 }
 
-// NB: If you update this field, you must update the the floated descendants flags.
-/// The bitmask of flags that represent the `has_left_floated_descendants` and
-/// `has_right_floated_descendants` fields.
-
-static HAS_FLOATED_DESCENDANTS_BITMASK: FlowFlags = FlowFlags { bits: 0b0000_0011 };
-
 /// The number of bits we must shift off to handle the text alignment field.
 ///
 /// NB: If you update this, update `TEXT_ALIGN` above.
@@ -699,11 +693,6 @@ impl FlowFlags {
                 FlowFlags::from_bits(value.to_u32() << TEXT_ALIGN_SHIFT).unwrap();
     }
 
-    #[inline]
-    pub fn union_floated_descendants_flags(&mut self, other: FlowFlags) {
-        self.insert(other & HAS_FLOATED_DESCENDANTS_BITMASK);
-    }
-
     #[inline]
     pub fn float_kind(&self) -> float::T {
         if self.contains(FLOATS_LEFT) {

From 4691dc0c6ed8b43f88b8406116d3a0698003dbf8 Mon Sep 17 00:00:00 2001
From: Samuel Harrington <samuel.l.harrington@gmail.com>
Date: Fri, 29 Apr 2016 20:13:42 -0700
Subject: [PATCH 2/2] Remove dead code from block.rs

---
 components/layout/block.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/layout/block.rs b/components/layout/block.rs
index 0b10ef39000..96cf52ec251 100644
--- a/components/layout/block.rs
+++ b/components/layout/block.rs
@@ -1518,8 +1518,6 @@ impl BlockFlow {
                     }
                 }
             }
-
-            flags.union_floated_descendants_flags(child_base.flags);
         }
 
         // FIXME(pcwalton): This should consider all float descendants, not just children.