Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove FlexFlowDisplayListBuilding

Browse source
This commit is contained in:
Anthony Ramine 2019-01-14 11:50:37 +01:00
parent 21cca5bb53
commit a92dd09fc9
3 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/layout/display_list/builder.rs
View file

@ -22,7 +22,6 @@ use crate::display_list::items::{PopAllTextShadowsDisplayItem, PushTextShadowDis
use crate::display_list::items::{StackingContext, StackingContextType, StickyFrameData}; use crate::display_list::items::{StackingContext, StackingContextType, StickyFrameData};
use crate::display_list::items::{TextOrientation, WebRenderImageInfo}; use crate::display_list::items::{TextOrientation, WebRenderImageInfo};
use crate::display_list::ToLayout; use crate::display_list::ToLayout;
use crate::flex::FlexFlow;
use crate::flow::{BaseFlow, Flow, FlowFlags}; use crate::flow::{BaseFlow, Flow, FlowFlags};
use crate::flow_ref::FlowRef; use crate::flow_ref::FlowRef;
use crate::fragment::SpecificFragmentInfo; 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 { impl BaseFlow {
pub fn build_display_items_for_debugging_tint( pub fn build_display_items_for_debugging_tint(
&self, &self,

1
components/layout/display_list/mod.rs
View file

@ -4,7 +4,6 @@
pub use self::builder::BorderPaintingMode; pub use self::builder::BorderPaintingMode;
pub use self::builder::DisplayListBuildState; pub use self::builder::DisplayListBuildState;
pub use self::builder::FlexFlowDisplayListBuilding;
pub use self::builder::IndexableText; pub use self::builder::IndexableText;
pub use self::builder::StackingContextCollectionFlags; pub use self::builder::StackingContextCollectionFlags;
pub use self::builder::StackingContextCollectionState; pub use self::builder::StackingContextCollectionState;

9
components/layout/flex.rs
View file

@ -6,8 +6,9 @@
use crate::block::{AbsoluteAssignBSizesTraversal, BlockFlow, MarginsMayCollapseFlag}; use crate::block::{AbsoluteAssignBSizesTraversal, BlockFlow, MarginsMayCollapseFlag};
use crate::context::LayoutContext; use crate::context::LayoutContext;
use crate::display_list::StackingContextCollectionState; use crate::display_list::{
use crate::display_list::{DisplayListBuildState, FlexFlowDisplayListBuilding}; BorderPaintingMode, DisplayListBuildState, StackingContextCollectionState,
};
use crate::floats::FloatKind; use crate::floats::FloatKind;
use crate::flow::{Flow, FlowClass, FlowFlags, GetBaseFlow, ImmutableFlowUtils, OpaqueFlow}; use crate::flow::{Flow, FlowClass, FlowFlags, GetBaseFlow, ImmutableFlowUtils, OpaqueFlow};
use crate::fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use crate::fragment::{Fragment, FragmentBorderBoxIterator, Overflow};
@ -1090,7 +1091,9 @@ impl Flow for FlexFlow {
} }
fn build_display_list(&mut self, state: &mut DisplayListBuildState) { 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) { fn collect_stacking_contexts(&mut self, state: &mut StackingContextCollectionState) {