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

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 block-formatting-contexts-{005|007} 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 922c983144fcc73eb0c40df9bdba56966857a2f1..c81a44a30c07ffce977f8e719aba85da6a328e90 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
@@ -285,8 +285,8 @@ bool NGInlineLayoutAlgorithm::CreateLineUpToLastBreakOpportunity() {
NGLogicalOffset origin_point =
GetOriginPointForFloats(ConstraintSpace(), content_size_);
- PositionPendingFloats(origin_point.block_offset, MutableConstraintSpace(),
- &container_builder_);
+ PositionPendingFloats(origin_point.block_offset, &container_builder_,
+ MutableConstraintSpace());
FindNextLayoutOpportunity();
return true;
}
@@ -383,9 +383,9 @@ 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);
+ container_builder_.MutablePositionedFloats().push_back(floating_object);
FindNextLayoutOpportunity();
}
}
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698