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

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

Issue 2790283003: Reset constraint space's BFC offset if block creates a new FC (Closed)
Patch Set: git rebase-update 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_constraint_space_builder.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc
index 00f0a390aab93d3fc5a3e6b294bd01d783cc1444..1974084634b56e33c59333b99bfbadad196081e4 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc
@@ -176,9 +176,7 @@ RefPtr<NGConstraintSpace> NGConstraintSpaceBuilder::ToConstraintSpace(
// Reset things that do not pass the Formatting Context boundary.
std::shared_ptr<NGExclusions> exclusions(
is_new_fc_ ? std::make_shared<NGExclusions>() : exclusions_);
- // TODO(glebl): Uncomment the line below once we add the fragmentation
- // support for floats.
- // NGLogicalOffset bfc_offset = is_new_fc_ ? NGLogicalOffset() : bfc_offset_;
+ NGLogicalOffset bfc_offset = is_new_fc_ ? NGLogicalOffset() : bfc_offset_;
NGMarginStrut margin_strut = is_new_fc_ ? NGMarginStrut() : margin_strut_;
WTF::Optional<LayoutUnit> clearance_offset =
is_new_fc_ ? WTF::nullopt : clearance_offset_;
@@ -193,8 +191,7 @@ RefPtr<NGConstraintSpace> NGConstraintSpaceBuilder::ToConstraintSpace(
is_inline_direction_triggers_scrollbar_,
is_block_direction_triggers_scrollbar_,
static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_,
- is_anonymous_, margin_strut, bfc_offset_, exclusions,
- clearance_offset));
+ is_anonymous_, margin_strut, bfc_offset, exclusions, clearance_offset));
}
return adoptRef(new NGConstraintSpace(
out_writing_mode, static_cast<TextDirection>(text_direction_),
@@ -204,7 +201,7 @@ RefPtr<NGConstraintSpace> NGConstraintSpaceBuilder::ToConstraintSpace(
is_block_direction_triggers_scrollbar_,
is_inline_direction_triggers_scrollbar_,
static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_,
- is_anonymous_, margin_strut, bfc_offset_, exclusions, clearance_offset));
+ is_anonymous_, margin_strut, bfc_offset, exclusions, clearance_offset));
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698