[layoutng] Add a shrink-to-fit flag to the constraint space

third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.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_layout_algorithm.h"
 
 #include "core/layout/ng/ng_break_token.h"
 #include "core/layout/ng/ng_constraint_space.h"
 #include "core/layout/ng/ng_constraint_space_builder.h"
 #include "core/layout/ng/ng_fragment_base.h"
@@ skipping 182 matching lines @@
 NGLayoutStatus NGBlockLayoutAlgorithm::Layout(
     NGPhysicalFragmentBase* child_fragment,
     NGPhysicalFragmentBase** fragment_out,
     NGLayoutAlgorithm** algorithm_out) {
   switch (state_) {
     case kStateInit: {
       border_and_padding_ =
           ComputeBorders(Style()) + ComputePadding(ConstraintSpace(), Style());
 
       WTF::Optional<MinAndMaxContentSizes> sizes;
-      if (NeedMinAndMaxContentSizes(Style())) {
+      if (NeedMinAndMaxContentSizes(ConstraintSpace(), Style())) {
         // TODOO(layout-ng): Implement
         sizes = MinAndMaxContentSizes();
       }
       LayoutUnit inline_size =
           ComputeInlineSizeForFragment(ConstraintSpace(), Style(), sizes);
       LayoutUnit adjusted_inline_size =
           inline_size - border_and_padding_.InlineSum();
       // TODO(layout-ng): For quirks mode, should we pass blockSize instead of
       // -1?
       LayoutUnit block_size = ComputeBlockSizeForFragment(
@@ skipping 221 matching lines @@
 void NGBlockLayoutAlgorithm::UpdateMarginStrut(const NGMarginStrut& from) {
   if (!is_fragment_margin_strut_block_start_updated_) {
     builder_->SetMarginStrutBlockStart(from);
     is_fragment_margin_strut_block_start_updated_ = true;
   }
   builder_->SetMarginStrutBlockEnd(from);
 }
 
 NGConstraintSpace*
 NGBlockLayoutAlgorithm::CreateConstraintSpaceForCurrentChild() const {
+  // TODO(layout-ng): Orthogonal children should also shrink to fit (in *their*
+  // inline axis)
+  // We have to keep this commented out for now until we correctly compute
+  // min/max content sizes in Layout().
+  // bool shrink_to_fit = CurrentChildStyle().display() == EDisplay::InlineBlock
+  // || CurrentChildStyle().isFloating();
+  bool shrink_to_fit = false;
   DCHECK(current_child_);
   space_builder_
       ->SetIsNewFormattingContext(
           IsNewFormattingContextForInFlowBlockLevelChild(ConstraintSpace(),
                                                          CurrentChildStyle()))
+      .SetForceShrinkToFit(shrink_to_fit)
       .SetWritingMode(
           FromPlatformWritingMode(CurrentChildStyle().getWritingMode()))
       .SetTextDirection(CurrentChildStyle().direction());
   NGConstraintSpace* child_space = space_builder_->ToConstraintSpace();
 
   // TODO(layout-ng): Set offset through the space builder.
   child_space->SetOffset(GetChildSpaceOffset());
   return child_space;
 }
 
 DEFINE_TRACE(NGBlockLayoutAlgorithm) {
   NGLayoutAlgorithm::trace(visitor);
   visitor->trace(first_child_);
   visitor->trace(constraint_space_);
   visitor->trace(break_token_);
   visitor->trace(builder_);
   visitor->trace(space_builder_);
   visitor->trace(space_for_current_child_);
   visitor->trace(current_child_);
 }
 
 }  // namespace blink