[layoutng] Create correct constraint spaces for children

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_constraint_space.h"
 #include "core/layout/ng/ng_fragment_builder.h"
 #include "core/layout/ng/ng_fragment.h"
 #include "core/layout/ng/ng_length_utils.h"
@@ skipping 24 matching lines @@
 
 bool NGBlockLayoutAlgorithm::Layout(const NGConstraintSpace* constraint_space,
                                     NGPhysicalFragment** out) {
   switch (state_) {
     case kStateInit: {
       border_and_padding_ =
           computeBorders(*style_) + computePadding(*constraint_space, *style_);
 
       LayoutUnit inline_size =
           computeInlineSizeForFragment(*constraint_space, *style_);
+      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(
-          *constraint_space, *style_, LayoutUnit(-1));
+          *constraint_space, *style_, NGSizeIndefinite);
+      LayoutUnit adjusted_block_size(block_size);
+      // Our calculated block-axis size may be indefinite at this point.
+      // If so, just leave the size as NGSizeIndefinite instead of subtracting
+      // borders and padding.
+      if (adjusted_block_size != NGSizeIndefinite)
+        adjusted_block_size -= border_and_padding_.BlockSum();
       constraint_space_for_children_ = new NGConstraintSpace(
-          *constraint_space, NGLogicalOffset(),
-          NGLogicalSize(inline_size - border_and_padding_.InlineSum(),
-                        block_size - border_and_padding_.BlockSum()));
+          FromPlatformWritingMode(style_->getWritingMode()),
+          FromPlatformDirection(style_->direction()), *constraint_space,
+          NGLogicalSize(adjusted_inline_size, adjusted_block_size));
       content_size_ = border_and_padding_.block_start;
 
       builder_ = new NGFragmentBuilder(NGPhysicalFragmentBase::FragmentBox);
       builder_->SetDirection(constraint_space->Direction());
       builder_->SetWritingMode(constraint_space->WritingMode());
       builder_->SetInlineSize(inline_size).SetBlockSize(block_size);
       current_child_ = first_child_;
       state_ = kStateChildLayout;
       return false;
     }
@@ skipping 93 matching lines @@
     margin_block_start = ComputeCollapsedMarginBlockStart(
         prev_child_margin_strut_, curr_margin_strut);
 
   prev_child_margin_strut_ = curr_margin_strut;
   // TODO(layout-ng): support other Margin Collapsing use cases,
   // i.e. support 0 height elements etc.
   return margin_block_start;
 }
 
 }  // namespace blink