NGInlineLayoutAlgorithm should take margins of inline floats into account

third_party/WebKit/Source/core/layout/ng/ng_inline_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_inline_layout_algorithm.h"
 
 #include "core/layout/BidiRun.h"
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/line/LineInfo.h"
 #include "core/layout/line/RootInlineBox.h"
@@ skipping 313 matching lines @@
   // diff writing mode - get the inline size from performing layout.
   RefPtr<NGLayoutResult> layout_result = node->Layout(float_space.get());
 
   NGBoxFragment float_fragment(
       float_space->WritingMode(),
       toNGPhysicalBoxFragment(layout_result->PhysicalFragment().get()));
 
   NGLogicalOffset origin_offset =
       GetOriginPointForFloats(ConstraintSpace(), content_size_);
   NGLogicalOffset from_offset = ConstraintSpace().BfcOffset();
-  // TODO(glebl): add margins calculation.
-  NGBoxStrut margins;
+  NGBoxStrut margins = ComputeMarginsForChild(*float_space.get(), node);

[ikilpatrick, 2017/04/06 16:24:31]

So I think this should actually be just:

NGBoxStrut margins = ComputeMargins(*float_space.get(), node->Style(), wm, dir);

We never need to apply auto margins for floats, so the above is fine.

And we don't want the rest of the patch I believe, see other comment.

[Gleb Lanbin, 2017/04/06 16:35:36]

Done.

   RefPtr<NGFloatingObject> floating_object = NGFloatingObject::Create(
       node->Style(), float_space->WritingMode(), current_opportunity_.size,
       origin_offset, from_offset, margins,
       layout_result->PhysicalFragment().get());
 
   bool float_does_not_fit = end_position + float_fragment.InlineSize() >
                             current_opportunity_.InlineSize();
   // Check if we already have a pending float. That's because a float cannot be
   // higher than any block or floated box generated before.
   if (!container_builder_.UnpositionedFloats().isEmpty() ||
@@ skipping 289 matching lines @@
     LayoutUnit baseline = line_top_with_leading + metrics.ascent_and_leading;
     root_line_box->setLineTopBottomPositions(
         baseline - metrics.ascent, baseline + metrics.descent,
         line_top_with_leading, baseline + metrics.descent_and_leading);
 
     bidi_runs.deleteRuns();
     fragments_for_bidi_runs.clear();
   }
 }
 }  // namespace blink