Auto merge of #10941 - samlh:patch-2, r=mbrubeck

Remove dead code left over from #10085

cc @pcwalton

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10941)
<!-- Reviewable:end -->

2 files changed, 0 insertions, 13 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.
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.
@@ -700,11 +694,6 @@ impl FlowFlags {
     }
 
     #[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) {
             float::T::left