[LayoutNG] Make table-cells always calculate thier block-size to the intrinsic size.

Prior to this patch, during simplified layout we'd calculate the block-size
of a table-cell the same as any node. This missed the specific table-cell
logic within the NGBlockLayoutAlgorithm.

This moves this logic down into the ComputeBlockSizeForFragment method.

Bug: 968016
Change-Id: Idb4d76bb199d1690705e1f24d9de3ea53e2c8af4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1637219Reviewed-by: Emil A Eklund <eae@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664843}

third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm.cc

@@ -610,12 +610,8 @@ scoped_refptr<const NGLayoutResult> NGBlockLayoutAlgorithm::FinishLayout(
       Node(), border_scrollbar_padding_, intrinsic_block_size_);
 
   // Recompute the block-axis size now that we know our content size.
-  // NOTE: For table cells, the block-size is just the intrinsic block-size.
-  border_box_size.block_size =
-      Node().IsTableCell()
-          ? intrinsic_block_size_
-          : ComputeBlockSizeForFragment(ConstraintSpace(), Style(),
-                                        border_padding_, intrinsic_block_size_);
+  border_box_size.block_size = ComputeBlockSizeForFragment(
+      ConstraintSpace(), Node(), border_padding_, intrinsic_block_size_);
   container_builder_.SetBlockSize(border_box_size.block_size);
 
   // If our BFC block-offset is still unknown, we check:
@@ -1732,7 +1728,7 @@ void NGBlockLayoutAlgorithm::FinalizeForFragmentation() {
   LayoutUnit used_block_size =
       BreakToken() ? BreakToken()->UsedBlockSize() : LayoutUnit();
   LayoutUnit block_size =
-      ComputeBlockSizeForFragment(ConstraintSpace(), Style(), border_padding_,
+      ComputeBlockSizeForFragment(ConstraintSpace(), Node(), border_padding_,
                                   used_block_size + intrinsic_block_size_);
 
   block_size -= used_block_size;

third_party/blink/renderer/core/layout/ng/ng_fieldset_layout_algorithm.cc

@@ -122,7 +122,7 @@ scoped_refptr<const NGLayoutResult> NGFieldsetLayoutAlgorithm::Layout() {
 
   // Recompute the block-axis size now that we know our content size.
   border_box_size.block_size = ComputeBlockSizeForFragment(
-      ConstraintSpace(), Style(), border_padding_, intrinsic_block_size);
+      ConstraintSpace(), Node(), border_padding_, intrinsic_block_size);
 
   // The above computation utility knows nothing about fieldset weirdness. The
   // legend may eat from the available content box block size. Make room for

third_party/blink/renderer/core/layout/ng/ng_flex_layout_algorithm.cc

@@ -41,7 +41,7 @@ LayoutUnit NGFlexLayoutAlgorithm::MainAxisContentExtent(
     LayoutUnit sum_hypothetical_main_size) {
   if (Style().IsColumnFlexDirection()) {
     return ComputeBlockSizeForFragment(
-               ConstraintSpace(), Style(), border_padding_,
+               ConstraintSpace(), Node(), border_padding_,
                sum_hypothetical_main_size + (border_padding_).BlockSum()) -
            border_scrollbar_padding_.BlockSum();
   }
@@ -324,7 +324,7 @@ scoped_refptr<const NGLayoutResult> NGFlexLayoutAlgorithm::Layout() {
   LayoutUnit intrinsic_block_size =
       intrinsic_block_content_size + border_scrollbar_padding_.BlockSum();
   LayoutUnit block_size = ComputeBlockSizeForFragment(
-      ConstraintSpace(), Style(), border_padding_, intrinsic_block_size);
+      ConstraintSpace(), Node(), border_padding_, intrinsic_block_size);
 
   container_builder_.SetBlockSize(block_size);
   container_builder_.SetIntrinsicBlockSize(

third_party/blink/renderer/core/layout/ng/ng_layout_utils.cc

@@ -262,7 +262,7 @@ NGLayoutCacheStatus CalculateSizeBasedLayoutCacheStatusWithGeometry(
     }
 
     block_size = ComputeBlockSizeForFragment(
-        new_space, style, fragment_geometry.border + fragment_geometry.padding,
+        new_space, node, fragment_geometry.border + fragment_geometry.padding,
         layout_result.IntrinsicBlockSize());
   }
 

third_party/blink/renderer/core/layout/ng/ng_length_utils.cc

@@ -517,16 +517,20 @@ LayoutUnit ComputeBlockSizeForFragmentInternal(
 
 LayoutUnit ComputeBlockSizeForFragment(
     const NGConstraintSpace& constraint_space,
-    const ComputedStyle& style,
+    const NGBlockNode& node,
     const NGBoxStrut& border_padding,
     LayoutUnit content_size) {
+  // The final block-size of a table-cell is always its intrinsic size.
+  if (node.IsTableCell() && content_size != kIndefiniteSize)
+    return content_size;
+
   if (constraint_space.IsFixedSizeBlock())
     return constraint_space.AvailableSize().block_size;
 
   if (constraint_space.IsAnonymous())
     return content_size;
 
-  return ComputeBlockSizeForFragmentInternal(constraint_space, style,
+  return ComputeBlockSizeForFragmentInternal(constraint_space, node.Style(),
                                              border_padding, content_size);
 }
 
@@ -1042,8 +1046,8 @@ NGFragmentGeometry CalculateInitialFragmentGeometry(
       constraint_space, node, border_scrollbar_padding);
   LogicalSize border_box_size(
       ComputeInlineSizeForFragment(constraint_space, node, border_padding),
-      ComputeBlockSizeForFragment(constraint_space, node.Style(),
-                                  border_padding, default_block_size));
+      ComputeBlockSizeForFragment(constraint_space, node, border_padding,
+                                  default_block_size));
 
   if (UNLIKELY(border_box_size.inline_size <
                    border_scrollbar_padding.InlineSum() &&

third_party/blink/renderer/core/layout/ng/ng_length_utils.h

@@ -253,7 +253,7 @@ CORE_EXPORT LayoutUnit ComputeInlineSizeForFragment(
 // Same as ComputeInlineSizeForFragment, but uses height instead of width.
 CORE_EXPORT LayoutUnit
 ComputeBlockSizeForFragment(const NGConstraintSpace&,
-                            const ComputedStyle&,
+                            const NGBlockNode&,
                             const NGBoxStrut& border_padding,
                             LayoutUnit content_size);
 

third_party/blink/renderer/core/layout/ng/ng_length_utils_test.cc

@@ -86,16 +86,6 @@ class NGLengthUtilsTest : public testing::Test {
                                            LengthResolvePhase::kLayout);
   }
 
-  LayoutUnit ComputeBlockSizeForFragment(
-      NGConstraintSpace constraint_space = ConstructConstraintSpace(200, 300),
-      LayoutUnit content_size = LayoutUnit()) {
-    NGBoxStrut border_padding = ComputeBordersForTest(*style_) +
-                                ComputePadding(constraint_space, *style_);
-
-    return ::blink::ComputeBlockSizeForFragment(constraint_space, *style_,
-                                                border_padding, content_size);
-  }
-
   scoped_refptr<ComputedStyle> style_;
 };
 
@@ -120,6 +110,20 @@ class NGLengthUtilsTestWithNode : public NGLayoutTest {
                                                  border_padding, &sizes);
   }
 
+  LayoutUnit ComputeBlockSizeForFragment(
+      NGConstraintSpace constraint_space = ConstructConstraintSpace(200, 300),
+      LayoutUnit content_size = LayoutUnit()) {
+    LayoutBox* body = ToLayoutBox(GetDocument().body()->GetLayoutObject());
+    body->SetStyle(style_);
+    body->SetPreferredLogicalWidthsDirty();
+    NGBlockNode node(body);
+
+    NGBoxStrut border_padding = ComputeBordersForTest(*style_) +
+                                ComputePadding(constraint_space, *style_);
+    return ::blink::ComputeBlockSizeForFragment(constraint_space, node,
+                                                border_padding, content_size);
+  }
+
   scoped_refptr<ComputedStyle> style_;
 };
 
@@ -344,7 +348,7 @@ TEST_F(NGLengthUtilsTestWithNode, testComputeInlineSizeForFragment) {
             ComputeInlineSizeForFragment(constraint_space, sizes));
 }
 
-TEST_F(NGLengthUtilsTest, testComputeBlockSizeForFragment) {
+TEST_F(NGLengthUtilsTestWithNode, testComputeBlockSizeForFragment) {
   style_->SetLogicalHeight(Length::Percent(30));
   EXPECT_EQ(LayoutUnit(90), ComputeBlockSizeForFragment());
 
@@ -402,7 +406,7 @@ TEST_F(NGLengthUtilsTest, testComputeBlockSizeForFragment) {
   // TODO(layout-ng): test {min,max}-content on max-height.
 }
 
-TEST_F(NGLengthUtilsTest, testIndefinitePercentages) {
+TEST_F(NGLengthUtilsTestWithNode, testIndefinitePercentages) {
   style_->SetMinHeight(Length::Fixed(20));
   style_->SetHeight(Length::Percent(20));
 

third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc

@@ -65,7 +65,7 @@ scoped_refptr<const NGLayoutResult> NGPageLayoutAlgorithm::Layout() {
 
   // Recompute the block-axis size now that we know our content size.
   border_box_size.block_size = ComputeBlockSizeForFragment(
-      ConstraintSpace(), Style(), border_padding_, intrinsic_block_size);
+      ConstraintSpace(), Node(), border_padding_, intrinsic_block_size);
   container_builder_.SetBlockSize(border_box_size.block_size);
 
   NGOutOfFlowLayoutPart(

third_party/blink/renderer/core/layout/ng/ng_simplified_layout_algorithm.cc

@@ -69,7 +69,7 @@ NGSimplifiedLayoutAlgorithm::NGSimplifiedLayoutAlgorithm(
   }
 
   container_builder_.SetBlockSize(ComputeBlockSizeForFragment(
-      ConstraintSpace(), Style(),
+      ConstraintSpace(), Node(),
       container_builder_.Borders() + container_builder_.Padding(),
       result.IntrinsicBlockSize()));
 

third_party/blink/web_tests/external/wpt/css/css-tables/dynamic-table-cell-height.html

+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="match" href="/css/reference/ref-filled-green-100px-square.xht">
+<link rel="help" href="https://crbug.com/968016">
+<script src="/common/reftest-wait.js"></script>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="display: table-cell; background: red; height: 50px;">
+  <div style="width: 100px; height: 100px; background: green; position: relative;">
+    <div id="target" style="position: absolute; width: 10px; height: 10px;"></div>
+  </div>
+</div>
+<script>
+document.body.offsetTop;
+document.getElementById('target').style.top = '10px';
+document.body.offsetTop;
+takeScreenshot();
+</script>