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

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

Issue 2711803007: Add ClearanceOffset to LayoutNG Constraint space. (Closed)
Patch Set: update TestExpectations Created 3 years, 10 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.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc
index 40b7ad094bd356e9d6d0583f92d3535c465be507..4cc561fde043a492d7e96d8f5a81a61dc6331017 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc
@@ -27,7 +27,8 @@ NGConstraintSpace::NGConstraintSpace(
bool is_new_fc,
const NGMarginStrut& margin_strut,
const NGLogicalOffset& bfc_offset,
- const std::shared_ptr<NGExclusions>& exclusions)
+ const std::shared_ptr<NGExclusions>& exclusions,
+ const WTF::Optional<LayoutUnit>& clearance_offset)
: available_size_(available_size),
percentage_resolution_size_(percentage_resolution_size),
initial_containing_block_size_(initial_containing_block_size),
@@ -45,7 +46,8 @@ NGConstraintSpace::NGConstraintSpace(
direction_(static_cast<unsigned>(direction)),
margin_strut_(margin_strut),
bfc_offset_(bfc_offset),
- exclusions_(exclusions) {}
+ exclusions_(exclusions),
+ clearance_offset_(clearance_offset) {}
NGConstraintSpace* NGConstraintSpace::CreateFromLayoutObject(
const LayoutBox& box) {
@@ -129,12 +131,17 @@ void NGConstraintSpace::Subtract(const NGBoxFragment*) {
}
String NGConstraintSpace::ToString() const {
- return String::format("Offset: %s,%s Size: %sx%s MarginStrut: %s",
- bfc_offset_.inline_offset.toString().ascii().data(),
- bfc_offset_.block_offset.toString().ascii().data(),
- AvailableSize().inline_size.toString().ascii().data(),
- AvailableSize().block_size.toString().ascii().data(),
- margin_strut_.ToString().ascii().data());
+ return String::format(
+ "Offset: %s,%s Size: %sx%s MarginStrut: %s"
+ " Clearance: %s",
+ bfc_offset_.inline_offset.toString().ascii().data(),
+ bfc_offset_.block_offset.toString().ascii().data(),
+ AvailableSize().inline_size.toString().ascii().data(),
+ AvailableSize().block_size.toString().ascii().data(),
+ margin_strut_.ToString().ascii().data(),
+ clearance_offset_.has_value()
+ ? clearance_offset_.value().toString().ascii().data()
+ : "none");
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698