Changeset 286786 in webkit

Timestamp:

Dec 9, 2021, 10:33:19 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Add support for empty bidi inline boxes
​https://bugs.webkit.org/show_bug.cgi?id=233896

Reviewed by Antti Koivisto.

Inline boxes with decoration only should also produce associated display boxes.

• layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:

(WebCore::Layout::createdDisplayBoxNodeForContainerBoxAndPushToAncestorStack):
(WebCore::Layout::InlineDisplayContentBuilder::ensureDisplayBoxForContainer):
(WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-09  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Add support for empty bidi inline boxes
+        https://bugs.webkit.org/show_bug.cgi?id=233896
+
+        Reviewed by Antti Koivisto.
+
+        Inline boxes with decoration only should also produce associated display boxes.
+
+        * layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
+        (WebCore::Layout::createdDisplayBoxNodeForContainerBoxAndPushToAncestorStack):
+        (WebCore::Layout::InlineDisplayContentBuilder::ensureDisplayBoxForContainer):
+        (WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):
+
 2021-12-09  J Pascoe  <j_pascoe@apple.com>
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp

@@ -364 +364 @@
 };
 
+static inline DisplayBoxNode& createdDisplayBoxNodeForContainerBoxAndPushToAncestorStack(const ContainerBox& containerBox, size_t displayBoxIndex, DisplayBoxNode& parentDisplayBoxNode, AncestorStack& ancestorStack)
+{
+    parentDisplayBoxNode.appendChild(displayBoxIndex);
+    auto& displayBoxNode = *parentDisplayBoxNode.children.last();
+    ancestorStack.push(displayBoxNode, containerBox);
+    return displayBoxNode;
+}
+
 DisplayBoxNode& InlineDisplayContentBuilder::ensureDisplayBoxForContainer(const ContainerBox& containerBox, AncestorStack& ancestorStack, DisplayBoxes& boxes)
 {
@@ -371 +379 @@
     auto& enclosingDisplayBoxNodeForContainer = ensureDisplayBoxForContainer(containerBox.parent(), ancestorStack, boxes);
     boxes.append({ m_lineIndex, InlineDisplay::Box::Type::NonRootInlineBox, containerBox, UBIDI_DEFAULT_LTR, { }, { }, { }, { }, true, { } });
-
-    enclosingDisplayBoxNodeForContainer.appendChild(boxes.size() - 1);
-    auto& displayBoxNodeForContainer = *enclosingDisplayBoxNodeForContainer.children.last();
-    ancestorStack.push(displayBoxNodeForContainer, containerBox);
-    return displayBoxNodeForContainer;
+    return createdDisplayBoxNodeForContainerBoxAndPushToAncestorStack(containerBox, boxes.size() - 1, enclosingDisplayBoxNodeForContainer, ancestorStack);
 }
 
@@ -455 +459 @@
             auto& layoutBox = lineRun.layoutBox();
 
-            auto isContentRun = !lineRun.isInlineBoxStart() && !lineRun.isLineSpanningInlineBoxStart() && !lineRun.isInlineBoxEnd() && !lineRun.isWordBreakOpportunity();
-            if (!isContentRun) {
-                // FIXME: Add support for inline boxes with no content.
+            auto needsDisplayBox = !lineRun.isInlineBoxEnd() && !lineRun.isWordBreakOpportunity();
+            if (!needsDisplayBox)
                 continue;
-            }
 
             auto visualRectRelativeToRoot = [&](auto logicallRect) {
@@ -472 +474 @@
                 appendTextDisplayBox(lineRun, visualRect, boxes);
                 contentRightInVisualOrder += visualRect.width();
-            } else if (lineRun.isSoftLineBreak()) {
+                parentDisplayBoxNode.appendChild(boxes.size() - 1);
+                continue;
+            }
+            if (lineRun.isSoftLineBreak()) {
                 ASSERT(!visualRectRelativeToRoot(lineBox.logicalRectForTextRun(lineRun)).width());
                 appendSoftLineBreakDisplayBox(lineRun, visualRectRelativeToRoot(lineBox.logicalRectForTextRun(lineRun)), boxes);
-            } else if (lineRun.isHardLineBreak()) {
+                parentDisplayBoxNode.appendChild(boxes.size() - 1);
+                continue;
+            }
+            if (lineRun.isHardLineBreak()) {
                 ASSERT(!visualRectRelativeToRoot(lineBox.logicalRectForLineBreakBox(layoutBox)).width());
                 appendHardLineBreakDisplayBox(lineRun, visualRectRelativeToRoot(lineBox.logicalRectForLineBreakBox(layoutBox)), boxes);
-            } else if (lineRun.isBox()) {
+                parentDisplayBoxNode.appendChild(boxes.size() - 1);
+                continue;
+            }
+            if (lineRun.isBox()) {
                 auto& boxGeometry = formattingState().boxGeometry(layoutBox);
                 auto visualRect = visualRectRelativeToRoot(lineBox.logicalBorderBoxForAtomicInlineLevelBox(layoutBox, boxGeometry));
@@ -484 +495 @@
                 appendAtomicInlineLevelDisplayBox(lineRun, visualRect, boxes);
                 contentRightInVisualOrder += boxGeometry.marginStart() + visualRect.width() + boxGeometry.marginEnd();
-            }
-            parentDisplayBoxNode.appendChild(boxes.size() - 1);
+                parentDisplayBoxNode.appendChild(boxes.size() - 1);
+                continue;
+            }
+            if (lineRun.isInlineBoxStart() || lineRun.isLineSpanningInlineBoxStart()) {
+                boxes.append({ m_lineIndex, InlineDisplay::Box::Type::NonRootInlineBox, layoutBox, UBIDI_DEFAULT_LTR, { }, { }, { }, { }, true, { } });
+                createdDisplayBoxNodeForContainerBoxAndPushToAncestorStack(downcast<ContainerBox>(layoutBox), boxes.size() - 1, parentDisplayBoxNode, ancestorStack);
+                continue;
+            }
+            ASSERT_NOT_REACHED();
         }
     };