servo: Merge #12677 - Remove unused inline_size_of_preceding_{left,right}_floats fields from BlockFlow (from Ms2ger:unused-float-sizes); r=Manishearth
authorMs2ger <Ms2ger@gmail.com>
Mon, 01 Aug 2016 08:04:30 -0500
changeset 339410 e546b71e8fba5e72a8b6d5759a7964b0f67c58c7
parent 339409 6785c4ec444f2b427f03ec59d9263e023ca1e10d
child 339411 048aac65573bb566b2e9dc804fa8e6f069742a1c
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersManishearth
servo: Merge #12677 - Remove unused inline_size_of_preceding_{left,right}_floats fields from BlockFlow (from Ms2ger:unused-float-sizes); r=Manishearth Source-Repo: https://github.com/servo/servo Source-Revision: e9d647ca5401f9603295882fe647a53c4ee88d14
servo/components/layout/block.rs
--- a/servo/components/layout/block.rs
+++ b/servo/components/layout/block.rs
@@ -506,24 +506,16 @@ pub enum FormattingContextType {
 #[derive(RustcEncodable)]
 pub struct BlockFlow {
     /// Data common to all flows.
     pub base: BaseFlow,
 
     /// The associated fragment.
     pub fragment: Fragment,
 
-    /// The sum of the inline-sizes of all logically left floats that precede this block. This is
-    /// used to speculatively lay out block formatting contexts.
-    inline_size_of_preceding_left_floats: Au,
-
-    /// The sum of the inline-sizes of all logically right floats that precede this block. This is
-    /// used to speculatively lay out block formatting contexts.
-    inline_size_of_preceding_right_floats: Au,
-
     /// Additional floating flow members.
     pub float: Option<Box<FloatedBlockInfo>>,
 
     /// Various flags.
     flags: BlockFlowFlags,
 }
 
 bitflags! {
@@ -543,18 +535,16 @@ impl BlockFlow {
     pub fn from_fragment(fragment: Fragment, float_kind: Option<FloatKind>) -> BlockFlow {
         let writing_mode = fragment.style().writing_mode;
         BlockFlow {
             base: BaseFlow::new(Some(fragment.style()), writing_mode, match float_kind {
                 Some(_) => ForceNonfloatedFlag::FloatIfNecessary,
                 None => ForceNonfloatedFlag::ForceNonfloated,
             }),
             fragment: fragment,
-            inline_size_of_preceding_left_floats: Au(0),
-            inline_size_of_preceding_right_floats: Au(0),
             float: float_kind.map(|kind| box FloatedBlockInfo::new(kind)),
             flags: BlockFlowFlags::empty(),
         }
     }
 
     /// Return the type of this block.
     ///
     /// This determines the algorithm used to calculate inline-size, block-size, and the