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_length_utils.cc

Issue 2525033002: Deprecate NGPhysicalConstraintSpace (Closed)
Patch Set: update TestExpectations Created 4 years 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 4388d544f4075986a113efa6ce68543d5106041d..50b6417c66c4b291e1086cf0b196cbc7145b5356 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
@@ -176,27 +176,26 @@ LayoutUnit ResolveBlockLength(const NGConstraintSpace& constraint_space,
}
LayoutUnit ComputeInlineSizeForFragment(
- const NGConstraintSpace& constraint_space,
+ const NGConstraintSpace& space,
const ComputedStyle& style,
const WTF::Optional<MinAndMaxContentSizes>& min_and_max) {
- if (constraint_space.FixedInlineSize())
- return constraint_space.AvailableSize().inline_size;
+ if (space.IsFixedSizeInline())
+ return space.AvailableSize().inline_size;
- LayoutUnit extent = ResolveInlineLength(constraint_space, style, min_and_max,
- style.logicalWidth(),
- LengthResolveType::kContentSize);
+ LayoutUnit extent =
+ ResolveInlineLength(space, style, min_and_max, style.logicalWidth(),
+ LengthResolveType::kContentSize);
Length max_length = style.logicalMaxWidth();
if (!max_length.isMaxSizeNone()) {
- LayoutUnit max =
- ResolveInlineLength(constraint_space, style, min_and_max, max_length,
- LengthResolveType::kMaxSize);
+ LayoutUnit max = ResolveInlineLength(space, style, min_and_max, max_length,
+ LengthResolveType::kMaxSize);
extent = std::min(extent, max);
}
LayoutUnit min =
- ResolveInlineLength(constraint_space, style, min_and_max,
- style.logicalMinWidth(), LengthResolveType::kMinSize);
+ ResolveInlineLength(space, style, min_and_max, style.logicalMinWidth(),
+ LengthResolveType::kMinSize);
extent = std::max(extent, min);
return extent;
}
@@ -205,7 +204,7 @@ LayoutUnit ComputeBlockSizeForFragment(
const NGConstraintSpace& constraint_space,
const ComputedStyle& style,
LayoutUnit content_size) {
- if (constraint_space.FixedBlockSize())
+ if (constraint_space.IsFixedSizeBlock())
return constraint_space.AvailableSize().block_size;
LayoutUnit extent =

Powered by Google App Engine
This is Rietveld 408576698