Skip to content
Permalink
Browse files

Remove FlexFlowDisplayListBuilding

  • Loading branch information...
nox committed Jan 14, 2019
1 parent 21cca5b commit a92dd09fc99a4646a919efd68c9dd9fac30e0f49
Showing with 6 additions and 17 deletions.
  1. +0 −13 components/layout/display_list/builder.rs
  2. +0 −1 components/layout/display_list/mod.rs
  3. +6 −3 components/layout/flex.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,
@@ -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;
@@ -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) {

0 comments on commit a92dd09

Please sign in to comment.
You can’t perform that action at this time.