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

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

Issue 2816933003: Use Layout Opportunity Iterator to position new FC blocks. (Closed)
Patch Set: Fix comments 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/inline/ng_inline_layout_algorithm.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc
index d78d6b0761ca57ea16f2a0389a06c37edbcd456c..2d745d4480cbb8604073ea68f6c307c08980e4d0 100644
--- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc
+++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc
@@ -280,8 +280,7 @@ bool NGInlineLayoutAlgorithm::CreateLineUpToLastBreakOpportunity() {
NGLogicalOffset origin_point =
GetOriginPointForFloats(ConstraintSpace(), content_size_);
- PositionPendingFloats(origin_point.block_offset, MutableConstraintSpace(),
- &container_builder_);
+ PositionPendingFloats(origin_point.block_offset);
FindNextLayoutOpportunity();
return true;
}
@@ -360,9 +359,8 @@ void NGInlineLayoutAlgorithm::LayoutAndPositionFloat(
float_does_not_fit) {
container_builder_.AddUnpositionedFloat(floating_object);
} else {
- NGLogicalOffset offset =
+ floating_object->logical_offset =
PositionFloat(floating_object.Get(), MutableConstraintSpace());
- container_builder_.AddFloatingObject(floating_object, offset);
FindNextLayoutOpportunity();
}
}

Powered by Google App Engine
This is Rietveld 408576698