NGInlineLayoutAlgorithm should take margins of inline floats into account

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

Index: third_party/WebKit/Source/core/layout/ng/ng_inline_layout_algorithm.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_inline_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/ng_inline_layout_algorithm.cc
index a108dbfab7c70003983ec3048c1c2c8eef9c4def..b72a6407cf76229fae7851fadf06dd848492f1b0 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_inline_layout_algorithm.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_inline_layout_algorithm.cc
@@ -331,10 +331,12 @@ void NGInlineLayoutAlgorithm::LayoutAndPositionFloat(
   NGLogicalOffset origin_offset =
       GetOriginPointForFloats(ConstraintSpace(), content_size_);
   NGLogicalOffset from_offset = ConstraintSpace().BfcOffset();
-  // TODO(glebl): add margins calculation.
-  NGBoxStrut margins;
+  const ComputedStyle& float_style = node->Style();
+  NGBoxStrut margins =
+      ComputeMargins(*float_space, float_style, float_space->WritingMode(),

[ikilpatrick, 2017/04/06 17:44:21]

.nit (can fix later)

I'm not sure why we passed writing-mode, and direction into computemargins as it
always should use the parents writing mode and direction; it probably makes
sense to remove these arguments.

(there is a subtle bug here as if the writing modes are orthogonal, you'll end
up with bad margins).  You'll need to give it a space which is in the parents
writing mode to resolve against the correct inline size.

+                     float_space->Direction());
   RefPtr<NGFloatingObject> floating_object = NGFloatingObject::Create(
-      node->Style(), float_space->WritingMode(), current_opportunity_.size,
+      float_style, float_space->WritingMode(), current_opportunity_.size,
       origin_offset, from_offset, margins,
       layout_result->PhysicalFragment().get());