Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_inline_layout_algorithm.cc

Issue 2798203002: NGInlineLayoutAlgorithm should take margins of inline floats into account (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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,

Powered by Google App Engine
This is Rietveld 408576698