Merge pull request #27 from SimonSapin/margin-collapsing

Implement margin collapsing between siblings and with parent
SimonSapin · Jun 13, 2019 · 62d2574 · 62d2574
2 parents 21a6454 + 242984c
commit 62d2574
Show file tree

Hide file tree

Showing 9 changed files with 264 additions and 90 deletions.
diff --git a/tests/reftests/blocks.html b/tests/reftests/blocks.html
@@ -1,9 +1,9 @@
 <!doctype html>
 <link rel=match href="blocks.png">
-<div style="margin: 20px 30px; padding: 10px 20px 30px 40px; background-color: green">
+<div style="margin: 20px 30px; padding: 5px 20px 30px 40px; background-color: green">
     <p>
     <p>
 </div>
 <style>
-p { background-color: blue; width: 200px; height: 100px; margin: 5px }
-</style>
+p { background-color: blue; width: 200px; height: 100px; margin: 10px 5px 5px }
+</style>
diff --git a/tests/reftests/blocks.png b/tests/reftests/blocks.png
diff --git a/victor/src/layout/flow/inline.rs b/victor/src/layout/flow/inline.rs
@@ -71,7 +71,7 @@ impl InlineFormattingContext {
         &self,
         containing_block: &ContainingBlock,
         tree_rank: usize,
-    ) -> (Vec<Fragment>, Vec<AbsolutelyPositionedFragment>, Length) {
+    ) -> FlowChildren {
         let mut ifc = InlineFormattingContextState {
             containing_block,
             absolutely_positioned_fragments: Vec::new(),
@@ -137,11 +137,12 @@ impl InlineFormattingContext {
             } else {
                 ifc.line_boxes
                     .finish_line(&mut ifc.current_nesting_level, containing_block);
-                return (
-                    ifc.line_boxes.boxes,
-                    ifc.absolutely_positioned_fragments,
-                    ifc.line_boxes.next_line_block_position,
-                );
+                return FlowChildren {
+                    fragments: ifc.line_boxes.boxes,
+                    absolutely_positioned_fragments: ifc.absolutely_positioned_fragments,
+                    block_size: ifc.line_boxes.next_line_block_position,
+                    collapsible_margins_in_children: CollapsedBlockMargins::zero(),
+                };
             }
         }
     }
@@ -242,6 +243,7 @@ impl<'box_tree> PartialInlineBoxFragment<'box_tree> {
             padding: self.padding.clone(),
             border: self.border.clone(),
             margin: self.margin.clone(),
+            block_margins_collapsed_with_children: CollapsedBlockMargins::zero(),
         };
         let last_fragment = self.last_box_tree_fragment && !at_line_break;
         if last_fragment {