[layoutng] For min/max-content, take CanUseNewLayout() into account

third_party/WebKit/Source/core/layout/ng/ng_box.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_box.h"
 
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/ng/layout_ng_block_flow.h"
 #include "core/layout/ng/ng_block_layout_algorithm.h"
 #include "core/layout/ng/ng_constraint_space_builder.h"
@@ skipping 49 matching lines @@
   }
   *out = new NGFragment(constraint_space->WritingMode(),
                         FromPlatformDirection(Style()->direction()),
                         fragment_.get());
   // Reset algorithm for future use
   layout_algorithm_ = nullptr;
   return true;
 }
 
 bool NGBox::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;
+  }
   DCHECK(!layout_algorithm_)
       << "Can't interleave Layout and ComputeMinAndMaxContentSizes";
   if (!minmax_algorithm_) {
     NGConstraintSpaceBuilder builder(
         FromPlatformWritingMode(Style()->getWritingMode()));
 
     builder.SetContainerSize(NGLogicalSize(LayoutUnit(), LayoutUnit()));
     // TODO(layoutng): Use builder.ToConstraintSpace.ToLogicalConstraintSpace
     // once
     // that's available.
@@ skipping 172 matching lines @@
       .SetBlockSize(layout_box_->logicalHeight())
       .SetDirection(FromPlatformDirection(layout_box_->styleRef().direction()))
       .SetWritingMode(
           FromPlatformWritingMode(layout_box_->styleRef().getWritingMode()))
       .SetInlineOverflow(overflow.width())
       .SetBlockOverflow(overflow.height());
   return builder.ToFragment();
 }
 
 }  // namespace blink