From a92dd09fc99a4646a919efd68c9dd9fac30e0f49 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Mon, 14 Jan 2019 11:50:37 +0100
Subject: [PATCH] Remove FlexFlowDisplayListBuilding

---
 components/layout/display_list/builder.rs | 13 -------------
 components/layout/display_list/mod.rs     |  1 -
 components/layout/flex.rs                 |  9 ++++++---
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs
index b91ce24127d..13f16e379e9 100644
--- a/components/layout/display_list/builder.rs
+++ b/components/layout/display_list/builder.rs
@@ -22,7 +22,6 @@ use crate::display_list::items::{PopAllTextShadowsDisplayItem, PushTextShadowDis
 use crate::display_list::items::{StackingContext, StackingContextType, StickyFrameData};
 use crate::display_list::items::{TextOrientation, WebRenderImageInfo};
 use crate::display_list::ToLayout;
-use crate::flex::FlexFlow;
 use crate::flow::{BaseFlow, Flow, FlowFlags};
 use crate::flow_ref::FlowRef;
 use crate::fragment::SpecificFragmentInfo;
@@ -2790,18 +2789,6 @@ impl BlockFlow {
     }
 }
 
-pub trait FlexFlowDisplayListBuilding {
-    fn build_display_list_for_flex(&mut self, state: &mut DisplayListBuildState);
-}
-
-impl FlexFlowDisplayListBuilding for FlexFlow {
-    fn build_display_list_for_flex(&mut self, state: &mut DisplayListBuildState) {
-        // Draw the rest of the block.
-        self.as_mut_block()
-            .build_display_list_for_block(state, BorderPaintingMode::Separate)
-    }
-}
-
 impl BaseFlow {
     pub fn build_display_items_for_debugging_tint(
         &self,
diff --git a/components/layout/display_list/mod.rs b/components/layout/display_list/mod.rs
index ad567c433fd..302728fbf22 100644
--- a/components/layout/display_list/mod.rs
+++ b/components/layout/display_list/mod.rs
@@ -4,7 +4,6 @@
 
 pub use self::builder::BorderPaintingMode;
 pub use self::builder::DisplayListBuildState;
-pub use self::builder::FlexFlowDisplayListBuilding;
 pub use self::builder::IndexableText;
 pub use self::builder::StackingContextCollectionFlags;
 pub use self::builder::StackingContextCollectionState;
diff --git a/components/layout/flex.rs b/components/layout/flex.rs
index 44055ae7d18..fd85b0c24c1 100644
--- a/components/layout/flex.rs
+++ b/components/layout/flex.rs
@@ -6,8 +6,9 @@
 
 use crate::block::{AbsoluteAssignBSizesTraversal, BlockFlow, MarginsMayCollapseFlag};
 use crate::context::LayoutContext;
-use crate::display_list::StackingContextCollectionState;
-use crate::display_list::{DisplayListBuildState, FlexFlowDisplayListBuilding};
+use crate::display_list::{
+    BorderPaintingMode, DisplayListBuildState, StackingContextCollectionState,
+};
 use crate::floats::FloatKind;
 use crate::flow::{Flow, FlowClass, FlowFlags, GetBaseFlow, ImmutableFlowUtils, OpaqueFlow};
 use crate::fragment::{Fragment, FragmentBorderBoxIterator, Overflow};
@@ -1090,7 +1091,9 @@ impl Flow for FlexFlow {
     }
 
     fn build_display_list(&mut self, state: &mut DisplayListBuildState) {
-        self.build_display_list_for_flex(state);
+        // Draw the rest of the block.
+        self.as_mut_block()
+            .build_display_list_for_block(state, BorderPaintingMode::Separate)
     }
 
     fn collect_stacking_contexts(&mut self, state: &mut StackingContextCollectionState) {