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

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

Issue 2872593003: [LayoutNG] Introduce NGPositionedFloat. (Closed)
Patch Set: small fixes Created 3 years, 7 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_block_layout_algorithm.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
index 01fe88e8638bfef6854f9fda34b74ddd617f44ac..609a42fd433132607435822d50e66b49ed1e12c3 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
@@ -93,10 +93,9 @@ void PositionPendingFloats(LayoutUnit origin_block_offset,
DCHECK(container_builder->BfcOffset())
<< "Parent BFC offset should be known here";
const auto& floating_objects = container_builder->UnpositionedFloats();
- PositionFloats(origin_block_offset,
- container_builder->BfcOffset().value().block_offset,
- floating_objects, space);
- container_builder->MutablePositionedFloats().AppendVector(floating_objects);
+ PositionFloats(
+ origin_block_offset, container_builder->BfcOffset().value().block_offset,
+ floating_objects, &container_builder->MutablePositionedFloats(), space);
container_builder->MutableUnpositionedFloats().clear();
}
@@ -429,7 +428,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm::PositionNewFc(
.SetIsNewFormattingContext(false)
.ToConstraintSpace(child_space.WritingMode());
PositionFloats(curr_bfc_offset_.block_offset, curr_bfc_offset_.block_offset,
- container_builder_.UnpositionedFloats(), tmp_space.Get());
+ container_builder_.UnpositionedFloats(),
+ /* positioned_floats */ nullptr, tmp_space.Get());
NGLogicalOffset origin_offset = curr_bfc_offset_;
origin_offset.inline_offset += border_and_padding_.inline_start;

Powered by Google App Engine
This is Rietveld 408576698