diff options
author | Patrick Walton <pcwalton@mimiga.net> | 2016-03-25 15:28:59 -0700 |
---|---|---|
committer | Patrick Walton <pcwalton@mimiga.net> | 2016-03-25 15:29:18 -0700 |
commit | aee0c445094acd14bd8df6b7bcc764a4c1440c65 (patch) | |
tree | 81fc09a2651ce3ed81edae2cf9599116fa166f53 | |
parent | 24d81e95b4ea3be8db623e15944e7a70b9e202fd (diff) | |
download | servo-aee0c445094acd14bd8df6b7bcc764a4c1440c65.tar.gz servo-aee0c445094acd14bd8df6b7bcc764a4c1440c65.zip |
layout: Minor whitespace cleanup.
-rw-r--r-- | components/layout/model.rs | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/components/layout/model.rs b/components/layout/model.rs index 6312bf3d30b..baacc756454 100644 --- a/components/layout/model.rs +++ b/components/layout/model.rs @@ -114,8 +114,8 @@ impl MarginCollapseInfo { } pub fn initialize_block_start_margin(&mut self, - fragment: &Fragment, - can_collapse_block_start_margin_with_kids: bool) { + fragment: &Fragment, + can_collapse_block_start_margin_with_kids: bool) { if !can_collapse_block_start_margin_with_kids { self.state = MarginCollapseState::AccumulatingMarginIn } @@ -239,25 +239,31 @@ impl MarginCollapseInfo { /// Adds the child's potentially collapsible block-end margin to the current margin state and /// advances the Y offset by the appropriate amount to handle that margin. Returns the amount /// that should be added to the Y offset during block layout. - pub fn advance_block_end_margin(&mut self, child_collapsible_margins: &CollapsibleMargins) -> Au { + pub fn advance_block_end_margin(&mut self, child_collapsible_margins: &CollapsibleMargins) + -> Au { match (self.state, *child_collapsible_margins) { (MarginCollapseState::AccumulatingCollapsibleTopMargin, CollapsibleMargins::None(..)) | - (MarginCollapseState::AccumulatingCollapsibleTopMargin, CollapsibleMargins::Collapse(..)) => { + (MarginCollapseState::AccumulatingCollapsibleTopMargin, + CollapsibleMargins::Collapse(..)) => { // Can't happen because the state will have been replaced with // `MarginCollapseState::AccumulatingMarginIn` above. panic!("should not be accumulating collapsible block_start margins anymore!") } - (MarginCollapseState::AccumulatingCollapsibleTopMargin, CollapsibleMargins::CollapseThrough(margin)) => { + (MarginCollapseState::AccumulatingCollapsibleTopMargin, + CollapsibleMargins::CollapseThrough(margin)) => { self.block_start_margin.union(margin); Au(0) } - (MarginCollapseState::AccumulatingMarginIn, CollapsibleMargins::None(_, block_end)) => { + (MarginCollapseState::AccumulatingMarginIn, + CollapsibleMargins::None(_, block_end)) => { assert_eq!(self.margin_in.most_positive, Au(0)); assert_eq!(self.margin_in.most_negative, Au(0)); block_end } - (MarginCollapseState::AccumulatingMarginIn, CollapsibleMargins::Collapse(_, block_end)) | - (MarginCollapseState::AccumulatingMarginIn, CollapsibleMargins::CollapseThrough(block_end)) => { + (MarginCollapseState::AccumulatingMarginIn, + CollapsibleMargins::Collapse(_, block_end)) | + (MarginCollapseState::AccumulatingMarginIn, + CollapsibleMargins::CollapseThrough(block_end)) => { self.margin_in.union(block_end); Au(0) } |