NGInlineLayoutAlgorithm should take margins of inline floats into account

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

 // 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.
 
 #include "core/layout/ng/ng_block_layout_algorithm.h"
 
 #include "core/layout/ng/ng_absolute_utils.h"
 #include "core/layout/ng/ng_block_child_iterator.h"
 #include "core/layout/ng/ng_box_fragment.h"
 #include "core/layout/ng/ng_constraint_space.h"
@@ skipping 259 matching lines @@
   if (ConstraintSpace().HasBlockFragmentation())
     FinalizeForFragmentation();
 
   return builder_.ToBoxFragment();
 }
 
 void NGBlockLayoutAlgorithm::PrepareChildLayout(NGLayoutInputNode* child) {
   DCHECK(child);
 
   // Calculate margins in parent's writing mode.
-  curr_child_margins_ = CalculateMargins(
-      child, *space_builder_.ToConstraintSpace(
-                 FromPlatformWritingMode(Style().getWritingMode())));
+  curr_child_margins_ = ComputeMarginsForChild(
+      *space_builder_.ToConstraintSpace(
+          FromPlatformWritingMode(Style().getWritingMode())),
+      child);
 
   // Set estimated BFC offset to the next child's constraint space.
   curr_bfc_offset_ = builder_.BfcOffset() ? builder_.BfcOffset().value()
                                           : ConstraintSpace().BfcOffset();
   curr_bfc_offset_.block_offset += content_size_;
   curr_bfc_offset_.inline_offset += border_and_padding_.inline_start;
 
   bool is_floating = child->IsBlock() && child->Style().isFloating();
 
   bool should_position_pending_floats =
@@ skipping 163 matching lines @@
     builder_.SetBlockSize(space_left);
     builder_.SetBlockOverflow(space_left);
     return;
   }
 
   // The end of the block fits in the current fragmentainer.
   builder_.SetBlockSize(block_size);
   builder_.SetBlockOverflow(content_size_);
 }
 
-NGBoxStrut NGBlockLayoutAlgorithm::CalculateMargins(
-    NGLayoutInputNode* child,
-    const NGConstraintSpace& space) {
-  DCHECK(child);
-  const ComputedStyle& child_style = child->Style();
-
-  WTF::Optional<MinMaxContentSize> sizes;
-  if (NeedMinMaxContentSize(space, child_style))
-    sizes = child->ComputeMinMaxContentSize();
-
-  LayoutUnit child_inline_size =
-      ComputeInlineSizeForFragment(space, child_style, sizes);
-  NGBoxStrut margins = ComputeMargins(space, child_style, space.WritingMode(),
-                                      space.Direction());
-  if (!child_style.isFloating()) {
-    ApplyAutoMargins(space, child_style, child_inline_size, &margins);
-  }
-  return margins;
-}
-
 RefPtr<NGConstraintSpace> NGBlockLayoutAlgorithm::CreateConstraintSpaceForChild(
     NGLayoutInputNode* child) {
   DCHECK(child);
 
   const ComputedStyle& child_style = child->Style();
   bool is_new_bfc = IsNewFormattingContextForBlockLevelChild(Style(), *child);
   space_builder_.SetIsNewFormattingContext(is_new_bfc)
       .SetBfcOffset(curr_bfc_offset_);
 
   if (child->IsInline()) {
@@ skipping 25 matching lines @@
       DCHECK(builder_.BfcOffset());
       space_available -= curr_bfc_offset_.block_offset;
     }
   }
   space_builder_.SetFragmentainerSpaceAvailable(space_available);
 
   return space_builder_.ToConstraintSpace(
       FromPlatformWritingMode(child_style.getWritingMode()));
 }
 }  // namespace blink