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

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

Issue 2453553002: Resolve ApplyAutoMargins's TODO in NGBlockLayoutAlgorithm. (Closed)
Patch Set: change ApplyAutoMargins to pass margins by pointer + DCHECK Created 4 years, 2 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_length_utils.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_length_utils.cc b/third_party/WebKit/Source/core/layout/ng/ng_length_utils.cc
index d84e13f1ed3bab3cceeff1d18d10c9231770a609..1d269f639894c85a4c837b8b8aae14136653b937 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_length_utils.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_length_utils.cc
@@ -287,19 +287,20 @@ NGBoxStrut ComputePadding(const NGConstraintSpace& constraintSpace,
void ApplyAutoMargins(const NGConstraintSpace& constraint_space,
const ComputedStyle& style,
const NGFragment& fragment,
- NGBoxStrut& margins) {
- const LayoutUnit used_space = fragment.InlineSize() + margins.InlineSum();
+ NGBoxStrut* margins) {
+ DCHECK(margins) << "Margins cannot be NULL here";
+ const LayoutUnit used_space = fragment.InlineSize() + margins->InlineSum();
const LayoutUnit available_space =
constraint_space.ContainerSize().inline_size - used_space;
if (available_space < LayoutUnit())
return;
if (style.marginStart().isAuto() && style.marginEnd().isAuto()) {
- margins.inline_start = available_space / 2;
- margins.inline_end = available_space - margins.inline_start;
+ margins->inline_start = available_space / 2;
+ margins->inline_end = available_space - margins->inline_start;
} else if (style.marginStart().isAuto()) {
- margins.inline_start = available_space;
+ margins->inline_start = available_space;
} else if (style.marginEnd().isAuto()) {
- margins.inline_end = available_space;
+ margins->inline_end = available_space;
}
}

Powered by Google App Engine
This is Rietveld 408576698