auto merge of #4619 : mbrubeck/servo/dead-top-margin, r=Ms2ger

Added in #1988 but never used. r? @pcwalton
This commit is contained in:
bors-servo 2015-01-12 16:12:46 -07:00
commit 8103bba19b

View file

@ -35,7 +35,7 @@ use flow_ref::FlowRef;
use fragment::{Fragment, FragmentBorderBoxIterator, SpecificFragmentInfo}; use fragment::{Fragment, FragmentBorderBoxIterator, SpecificFragmentInfo};
use incremental::{RECONSTRUCT_FLOW, REFLOW, REFLOW_OUT_OF_FLOW, RestyleDamage}; use incremental::{RECONSTRUCT_FLOW, REFLOW, REFLOW_OUT_OF_FLOW, RestyleDamage};
use inline::InlineFlow; use inline::InlineFlow;
use model::{CollapsibleMargins, IntrinsicISizes, MarginCollapseInfo}; use model::{CollapsibleMargins, IntrinsicISizes};
use parallel::FlowParallelInfo; use parallel::FlowParallelInfo;
use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, TableFlow}; use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, TableFlow};
use table_caption::TableCaptionFlow; use table_caption::TableCaptionFlow;
@ -228,12 +228,6 @@ pub trait Flow: fmt::Show + ToString + Sync {
iterator: &mut FragmentBorderBoxIterator, iterator: &mut FragmentBorderBoxIterator,
stacking_context_position: &Point2D<Au>); stacking_context_position: &Point2D<Au>);
fn compute_collapsible_block_start_margin(&mut self,
_layout_context: &mut LayoutContext,
_margin_collapse_info: &mut MarginCollapseInfo) {
// The default implementation is a no-op.
}
/// Marks this flow as the root flow. The default implementation is a no-op. /// Marks this flow as the root flow. The default implementation is a no-op.
fn mark_as_root(&mut self) {} fn mark_as_root(&mut self) {}