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

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_block_node.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_block_node.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
index 3a652003e292bdf5574ecff367ac127a034c5fca..91753db6ae5b13bc811c97b86ab72a0dbfa65603 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
@@ -100,9 +100,11 @@ bool NGBlockNode::ComputeMinAndMaxContentSizes(MinAndMaxContentSizes* sizes) {
// TODO(layoutng): Use builder.ToConstraintSpace.ToLogicalConstraintSpace
cbiesinger 2016/12/01 21:11:37 This TODO can be removed now.
Gleb Lanbin 2016/12/05 17:46:53 done http://crrev.com/2557463002
// once
// that's available.
- NGConstraintSpace* constraint_space = new NGConstraintSpace(
- FromPlatformWritingMode(Style()->getWritingMode()),
- Style()->direction(), builder.ToConstraintSpace());
+ NGConstraintSpace* constraint_space =
+ NGConstraintSpaceBuilder(
+ FromPlatformWritingMode(Style()->getWritingMode()))
+ .SetTextDirection(Style()->direction())
+ .ToConstraintSpace();
minmax_algorithm_ = new NGBlockLayoutAlgorithm(
Style(), toNGBlockNode(FirstChild()), constraint_space);
@@ -130,14 +132,13 @@ bool NGBlockNode::ComputeMinAndMaxContentSizes(MinAndMaxContentSizes* sizes) {
sizes->min_content = fragment->InlineOverflow();
// Now, redo with infinite space for max_content
- NGConstraintSpaceBuilder builder(
- FromPlatformWritingMode(Style()->getWritingMode()));
- builder.SetAvailableSize(NGLogicalSize(LayoutUnit::max(), LayoutUnit()));
- builder.SetPercentageResolutionSize(
- NGLogicalSize(LayoutUnit(), LayoutUnit()));
NGConstraintSpace* constraint_space =
- new NGConstraintSpace(FromPlatformWritingMode(Style()->getWritingMode()),
- Style()->direction(), builder.ToConstraintSpace());
+ NGConstraintSpaceBuilder(
+ FromPlatformWritingMode(Style()->getWritingMode()))
+ .SetTextDirection(Style()->direction())
+ .SetAvailableSize({LayoutUnit::max(), LayoutUnit()})
+ .SetPercentageResolutionSize({LayoutUnit(), LayoutUnit()})
+ .ToConstraintSpace();
minmax_algorithm_ = new NGBlockLayoutAlgorithm(
Style(), toNGBlockNode(FirstChild()), constraint_space);

Powered by Google App Engine
This is Rietveld 408576698