Chromium Code Reviews| 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..77b36c190d816b1a9e2b6a84767dd4fc6097f38e 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,8 +331,7 @@ void NGInlineLayoutAlgorithm::LayoutAndPositionFloat( |
| 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:
NGBoxStr
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, |