Ignore zero-height fragments during margin collapsing

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NGBlockLayoutAlgorithm_h
 #define NGBlockLayoutAlgorithm_h
 
 #include "core/CoreExport.h"
 #include "core/layout/ng/ng_box.h"
 #include "core/layout/ng/ng_fragment_builder.h"
@@ skipping 34 matching lines @@
     visitor->trace(current_child_);
   }
 
  private:
   // Computes collapsed margins for 2 adjoining blocks and updates the resultant
   // fragment's MarginStrut if needed.
   // See https://www.w3.org/TR/CSS2/box.html#collapsing-margins
   //
   // @param space Constraint space for the block.
   // @param child_margins Margins information for the current child.
-  // @param children_margin_strut MarginStrut for children of the current child.
+  // @param fragment Children's fragment.

[ikilpatrick, 2016/09/19 17:04:19]

Child fragment or Current child fragment? 

[Gleb Lanbin, 2016/09/19 17:39:52]

Done.

   // @return Margin block start based on collapsed margins result.
   LayoutUnit CollapseMargins(const NGConstraintSpace& space,
                              const NGBoxStrut& child_margins,
-                             const NGMarginStrut& children_margin_strut);
+                             const NGFragment& fragment);
 
   RefPtr<const ComputedStyle> style_;
   Member<NGBox> first_child_;
 
   enum State { kStateInit, kStateChildLayout, kStateFinalize };
   State state_;
   Member<NGFragmentBuilder> builder_;
   Member<NGConstraintSpace> constraint_space_for_children_;
   Member<NGBox> current_child_;
   NGBoxStrut border_and_padding_;
   LayoutUnit content_size_;
   LayoutUnit max_inline_size_;
   // MarginStrut for the previous child.
   NGMarginStrut prev_child_margin_strut_;
 };
 
 }  // namespace blink
 
 #endif  // NGBlockLayoutAlgorithm_h