Fix incorrectly calculated content_size for fragments that create new FC

third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc

Index: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
index c56b00f30e04912ed9ef24b3e2aa87c185af54b2..59b86b9a2b25cf5041df750087d5d711029c8144 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
@@ -81,16 +81,16 @@ bool NGBlockLayoutAlgorithm::Layout(const NGConstraintSpace* constraint_space,
             constraint_space_for_children_->WritingMode(),
             constraint_space_for_children_->Direction());
 
-        LayoutUnit margin_block_start =
+        const NGBoxStrut margins =
             CollapseMargins(*constraint_space, child_margins, *fragment);
 
         // TODO(layout-ng): Support auto margins
-        builder_->AddChild(fragment,
-                           NGLogicalOffset(border_and_padding_.inline_start +
-                                               child_margins.inline_start,
-                                           content_size_ + margin_block_start));
+        builder_->AddChild(
+            fragment, NGLogicalOffset(border_and_padding_.inline_start +
+                                          child_margins.inline_start,
+                                      content_size_ + margins.block_start));
 
-        content_size_ += fragment->BlockSize() + margin_block_start;
+        content_size_ += fragment->BlockSize() + margins.BlockSum();
         max_inline_size_ =
             std::max(max_inline_size_, fragment->InlineSize() +
                                            child_margins.InlineSum() +
@@ -104,6 +104,7 @@ bool NGBlockLayoutAlgorithm::Layout(const NGConstraintSpace* constraint_space,
     }
     case kStateFinalize: {
       content_size_ += border_and_padding_.block_end;
+
       // Recompute the block-axis size now that we know our content size.
       LayoutUnit block_size = computeBlockSizeForFragment(
           *constraint_space, *style_, content_size_);
@@ -121,17 +122,16 @@ bool NGBlockLayoutAlgorithm::Layout(const NGConstraintSpace* constraint_space,
   return true;
 }
 
-LayoutUnit NGBlockLayoutAlgorithm::CollapseMargins(
+NGBoxStrut NGBlockLayoutAlgorithm::CollapseMargins(
     const NGConstraintSpace& space,
     const NGBoxStrut& margins,
     const NGFragment& fragment) {
-  // Zero-height boxes are ignored and do not participate in margin collapsing.
-  bool is_zero_height_box = !fragment.BlockSize() && margins.IsEmpty();
-  if (is_zero_height_box)
-    return LayoutUnit();
-
-  // Create the current child's margin strut from its children's margin strut.
-  NGMarginStrut curr_margin_strut = fragment.MarginStrut();
+  bool is_zero_height_box = !fragment.BlockSize() && margins.IsEmpty() &&
+                            fragment.MarginStrut().IsEmpty();
+  // Create the current child's margin strut from its children's margin strut or
+  // use margin strut from the the last non-empty child.
+  NGMarginStrut curr_margin_strut =
+      is_zero_height_box ? prev_child_margin_strut_ : fragment.MarginStrut();
 
   // Calculate borders and padding for the current child.
   NGBoxStrut border_and_padding =
@@ -157,13 +157,25 @@ LayoutUnit NGBlockLayoutAlgorithm::CollapseMargins(
     curr_margin_strut.SetMarginBlockEnd(margins.block_end);
   }
 
+  NGBoxStrut result_margins;
+  // Margins of the newly established formatting context do not participate
+  // in Collapsing Margins.
+  bool is_last_child = !current_child_->NextSibling();
+  if (is_last_child && space.IsNewFormattingContext()) {
+    result_margins.block_end = curr_margin_strut.BlockEndSum();
+    builder_->ClearMarginStrut();

[ikilpatrick, 2016/10/04 16:21:35]

isn't this immediately going to be set at UpdateMarginStrut?

Instead of clearing can we just set it when needed?

+  }
+
+  // Zero-height boxes are ignored and do not participate in margin collapsing.
+  if (is_zero_height_box)
+    return result_margins;
+
   // Compute the margin block start for
   // 1) adjoining blocks
   // 2) 1st block in the newly established formatting context.
-  LayoutUnit margin_block_start;
   if (is_fragment_margin_strut_block_start_updated_ ||
       space.IsNewFormattingContext()) {
-    margin_block_start = ComputeCollapsedMarginBlockStart(
+    result_margins.block_start = ComputeCollapsedMarginBlockStart(
         prev_child_margin_strut_, curr_margin_strut);
   }
 
@@ -171,7 +183,7 @@ LayoutUnit NGBlockLayoutAlgorithm::CollapseMargins(
   UpdateMarginStrut(curr_margin_strut);
 
   prev_child_margin_strut_ = curr_margin_strut;
-  return margin_block_start;
+  return result_margins;
 }
 
 void NGBlockLayoutAlgorithm::UpdateMarginStrut(const NGMarginStrut& from) {