Include all fragments to visual overflow for inline children

This patch includes all block-fragmented fragments when
computing visual overflow.

When uniting, it should stitch the block offset, but this
patch does not do that because the multicol container cannot
compute visual overflow in the block direction. This is
tracked in <crbug.com/1144203>.

Eliminates one call to |CurrentFragment|. One more use to go,
other than usages in tests. It will be in following patches.

Bug: 1061423
Change-Id: Iaef43b93c8643f42929739dc2221a1eaf3226c3d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2509609
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822875}

third_party/blink/renderer/core/layout/layout_block_flow_line.cc

@@ -2431,22 +2431,28 @@ void LayoutBlockFlow::AddVisualOverflowFromInlineChildren() {
         AddContentsVisualOverflow(child_rect);
       }
     }
-  } else if (const NGPhysicalBoxFragment* fragment = CurrentFragment()) {
-    if (const NGFragmentItems* items = fragment->Items()) {
-      for (NGInlineCursor cursor(*fragment, *items); cursor;
-           cursor.MoveToNextSkippingChildren()) {
-        const NGFragmentItem* child = cursor.CurrentItem();
-        DCHECK(child);
-        if (child->HasSelfPaintingLayer())
-          continue;
-        PhysicalRect child_rect = child->InkOverflow();
-        if (!child_rect.IsEmpty()) {
-          child_rect.offset += child->OffsetInContainerBlock();
-          AddContentsVisualOverflow(child_rect);
+  } else if (PhysicalFragmentCount()) {
+    // TODO(crbug.com/1144203): This should compute in the stitched coordinate
+    // system, but overflows in the block direction is converted to the inline
+    // direction in the multicol container. Just unite overflows in the inline
+    // direction only for now.
+    for (const NGPhysicalBoxFragment& fragment : PhysicalFragments()) {
+      if (const NGFragmentItems* items = fragment.Items()) {
+        for (NGInlineCursor cursor(fragment, *items); cursor;
+             cursor.MoveToNextSkippingChildren()) {
+          const NGFragmentItem* child = cursor.CurrentItem();
+          DCHECK(child);
+          if (child->HasSelfPaintingLayer())
+            continue;
+          PhysicalRect child_rect = child->InkOverflow();
+          if (!child_rect.IsEmpty()) {
+            child_rect.offset += child->OffsetInContainerBlock();
+            AddContentsVisualOverflow(child_rect);
+          }
         }
+      } else if (fragment.HasFloatingDescendantsForPaint()) {
+        AddVisualOverflowFromFloats(fragment);
       }
-    } else if (fragment->HasFloatingDescendantsForPaint()) {
-      AddVisualOverflowFromFloats(*fragment);
     }
   } else {
     for (RootInlineBox* curr = FirstRootBox(); curr;

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

@@ -242,5 +242,48 @@ TEST_F(NGFragmentationTest, HasSeenAllChildrenIfc) {
   EXPECT_FALSE(break_token);
 }
 
+TEST_F(NGFragmentationTest, InkOverflowInline) {
+  SetBodyInnerHTML(R"HTML(
+    <style>
+    #container {
+      font-size: 10px;
+      column-width: 100px;
+      column-gap: 10px;
+      width: 210px;
+      line-height: 15px;
+      height: 15px;
+    }
+    atomic {
+      display: inline-block;
+      width: 100px;
+      height: 10px;
+      background: blue;
+    }
+    .w15 {
+      width: 150px;
+      background: orange;
+    }
+    </style>
+    <div id="container">
+      <div>
+        <!-- 1st column does not have ink overflow. -->
+        <atomic></atomic>
+        <!-- 2nd column has 50px ink overflow to right. -->
+        <atomic><atomic class="w15"></atomic></atomic>
+      </div>
+    </div>
+  )HTML");
+  const auto* container =
+      To<LayoutBlockFlow>(GetLayoutObjectByElementId("container"));
+  const auto* flow_thread = To<LayoutBlockFlow>(container->FirstChild());
+  DCHECK(flow_thread->IsLayoutFlowThread());
+  // |flow_thread| is in the stitched coordinate system.
+  EXPECT_EQ(flow_thread->PhysicalVisualOverflowRect(),
+            PhysicalRect(0, 0, 150, 30));
+  // TOOD(crbug.com/1144203): This should be (0, 0, 260, 15).
+  EXPECT_EQ(container->PhysicalVisualOverflowRect(),
+            PhysicalRect(0, 0, 210, 15));
+}
+
 }  // anonymous namespace
 }  // namespace blink