Do not collapse margins with padding/border b/w parent and first/last child

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

Index: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
index 924bf4accf411e00a5ff63245bf5c444e3aeb7f2..2068c35b6bcce5cfa8e30825d7449151700d01f5 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
@@ -52,9 +52,11 @@ class CORE_EXPORT NGBlockLayoutAlgorithm : public NGLayoutAlgorithm {
   //
   // @param child_margins Margins information for the current child.
   // @param children_margin_strut MarginStrut for children of the current child.
+  // @param space Constraint space for the block.
   // @return Margin block start based on collapsed margins result.
   LayoutUnit CollapseMargins(const NGBoxStrut& child_margins,
-                             const NGMarginStrut& children_margin_strut);
+                             const NGMarginStrut& children_margin_strut,
+                             const NGConstraintSpace& space);

[ikilpatrick, 2016/09/14 18:45:26]

astronomically tiny nit: can you make space the first argument?

(to be consistent with ng_length_utils , basically arguments that don't "change"
between subsequent calls go first).

[Gleb Lanbin, 2016/09/14 18:58:32]

done.
all 3 arguments are const references so the "mutable vs const" arguments order
is correct here. I changed the order to be consistent with ng_length_utils.
thanks.

 
   RefPtr<const ComputedStyle> style_;
   Member<NGBox> first_child_;