[LayoutNG] Return MinAndMaxContentSizes by value, step 1

third_party/WebKit/Source/core/layout/ng/ng_block_node.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/ng/ng_block_node.h"
 
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/line/InlineIterator.h"
 #include "core/layout/ng/layout_ng_block_flow.h"
@@ skipping 77 matching lines @@
     fragment_ = toNGPhysicalBoxFragment(algorithm->Layout());
     CopyFragmentDataToLayoutBox(*constraint_space);
   } else {
     DCHECK(layout_box_);
     fragment_ = RunOldLayout(*constraint_space);
   }
 
   return fragment_;
 }
 
-MinAndMaxContentSizes NGBlockNode::ComputeMinAndMaxContentSizesSync() {
+MinAndMaxContentSizes NGBlockNode::ComputeMinAndMaxContentSizes() {
   MinAndMaxContentSizes sizes;
-  while (!ComputeMinAndMaxContentSizes(&sizes))
-    continue;
-  return sizes;
-}
-
-bool NGBlockNode::ComputeMinAndMaxContentSizes(MinAndMaxContentSizes* sizes) {
   if (!CanUseNewLayout()) {
     DCHECK(layout_box_);
     // TODO(layout-ng): This could be somewhat optimized by directly calling
     // computeIntrinsicLogicalWidths, but that function is currently private.
     // Consider doing that if this becomes a performance issue.
     LayoutUnit borderAndPadding = layout_box_->borderAndPaddingLogicalWidth();
-    sizes->min_content = layout_box_->computeLogicalWidthUsing(
-                             MainOrPreferredSize, Length(MinContent),
-                             LayoutUnit(), layout_box_->containingBlock()) -
-                         borderAndPadding;
-    sizes->max_content = layout_box_->computeLogicalWidthUsing(
-                             MainOrPreferredSize, Length(MaxContent),
-                             LayoutUnit(), layout_box_->containingBlock()) -
-                         borderAndPadding;
-    return true;
+    sizes.min_content = layout_box_->computeLogicalWidthUsing(
+                            MainOrPreferredSize, Length(MinContent),
+                            LayoutUnit(), layout_box_->containingBlock()) -
+                        borderAndPadding;
+    sizes.max_content = layout_box_->computeLogicalWidthUsing(
+                            MainOrPreferredSize, Length(MaxContent),
+                            LayoutUnit(), layout_box_->containingBlock()) -
+                        borderAndPadding;
+    return sizes;
   }
 
   NGConstraintSpace* constraint_space =
       NGConstraintSpaceBuilder(
           FromPlatformWritingMode(Style()->getWritingMode()))
           .SetTextDirection(Style()->direction())
           .ToConstraintSpace();
 
   // TODO(cbiesinger): For orthogonal children, we need to always synthesize.
   NGBlockLayoutAlgorithm minmax_algorithm(
       layout_box_, Style(), toNGBlockNode(FirstChild()), constraint_space);
-  if (minmax_algorithm.ComputeMinAndMaxContentSizes(sizes))
-    return true;
+  if (minmax_algorithm.ComputeMinAndMaxContentSizes(&sizes))
+    return sizes;
 
   // Have to synthesize this value.
   NGPhysicalFragment* physical_fragment = Layout(constraint_space);
   NGBoxFragment* fragment = new NGBoxFragment(
       FromPlatformWritingMode(Style()->getWritingMode()), Style()->direction(),
       toNGPhysicalBoxFragment(physical_fragment));
 
-  sizes->min_content = fragment->InlineOverflow();
+  sizes.min_content = fragment->InlineOverflow();
 
   // Now, redo with infinite space for max_content
   constraint_space =
       NGConstraintSpaceBuilder(
           FromPlatformWritingMode(Style()->getWritingMode()))
           .SetTextDirection(Style()->direction())
           .SetAvailableSize({LayoutUnit::max(), LayoutUnit()})
           .SetPercentageResolutionSize({LayoutUnit(), LayoutUnit()})
           .ToConstraintSpace();
 
   physical_fragment = Layout(constraint_space);
   fragment = new NGBoxFragment(
       FromPlatformWritingMode(Style()->getWritingMode()), Style()->direction(),
       toNGPhysicalBoxFragment(physical_fragment));
-  sizes->max_content = fragment->InlineOverflow();
-  return true;
+  sizes.max_content = fragment->InlineOverflow();
+  return sizes;
 }
 
 ComputedStyle* NGBlockNode::MutableStyle() {
   if (style_)
     return style_.get();
   DCHECK(layout_box_);
   return layout_box_->mutableStyle();
 }
 
 const ComputedStyle* NGBlockNode::Style() const {
@@ skipping 172 matching lines @@
 // Save static position for legacy AbsPos layout.
 void NGBlockNode::SaveStaticOffsetForLegacy(const NGLogicalOffset& offset) {
   DCHECK(layout_box_);
   DCHECK(layout_box_->isOutOfFlowPositioned());
   DCHECK(layout_box_->layer());
   layout_box_->layer()->setStaticBlockPosition(offset.block_offset);
   layout_box_->layer()->setStaticInlinePosition(offset.inline_offset);
 }
 
 }  // namespace blink