Changeset 286789 in webkit

Timestamp:

Dec 9, 2021, 11:01:10 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Add support for ink overflow on bidi inline boxes
​https://bugs.webkit.org/show_bug.cgi?id=233968

Reviewed by Antti Koivisto.

• layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:

(WebCore::Layout::InlineDisplayContentBuilder::appendInlineDisplayBoxAtBidiBoundary):
(WebCore::Layout::InlineDisplayContentBuilder::ensureDisplayBoxForContainer):
(WebCore::Layout::InlineDisplayContentBuilder::adjustVisualGeometryForChildNode):
(WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):

• layout/formattingContexts/inline/InlineDisplayContentBuilder.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-09  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Add support for ink overflow on bidi inline boxes
+        https://bugs.webkit.org/show_bug.cgi?id=233968
+
+        Reviewed by Antti Koivisto.
+
+        * layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
+        (WebCore::Layout::InlineDisplayContentBuilder::appendInlineDisplayBoxAtBidiBoundary):
+        (WebCore::Layout::InlineDisplayContentBuilder::ensureDisplayBoxForContainer):
+        (WebCore::Layout::InlineDisplayContentBuilder::adjustVisualGeometryForChildNode):
+        (WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):
+        * layout/formattingContexts/inline/InlineDisplayContentBuilder.h:
+
 2021-12-09  Alan Bujtas  <zalan@apple.com>
 

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

@@ -129 +129 @@
         , InlineDisplay::Box::Text { text->start, text->length, content, adjustedContentToRender(), text->needsHyphen }
         , true
-        , { } });
+        , { }
+    });
 }
 
@@ -146 +147 @@
         , softLineBreakRunRect
         , lineRun.expansion()
-        , InlineDisplay::Box::Text { text->start, text->length, downcast<InlineTextBox>(layoutBox).content() } });
+        , InlineDisplay::Box::Text { text->start, text->length, downcast<InlineTextBox>(layoutBox).content() }
+    });
 }
 
@@ -160 +162 @@
         , lineBreakBoxRect
         , lineRun.expansion()
-        , { } });
+        , { }
+    });
 
     auto& boxGeometry = formattingState().boxGeometry(layoutBox);
@@ -186 +189 @@
         , inkOverflow()
         , lineRun.expansion()
-        , { } });
+        , { }
+    });
     // Note that inline boxes are relative to the line and their top position can be negative.
     // Atomic inline boxes are all set. Their margin/border/content box geometries are already computed. We just have to position them here.
@@ -237 +241 @@
         , { }
         , inlineBox.hasContent()
-        , isFirstLastBox(inlineBox) });
+        , isFirstLastBox(inlineBox)
+    });
     // This inline box showed up first on this line.
     setInlineBoxGeometry(layoutBox, inlineBoxBorderBox, true);
@@ -262 +267 @@
         , { }
         , inlineBox.hasContent()
-        , isFirstLastBox(inlineBox) });
+        , isFirstLastBox(inlineBox)
+    });
     // Middle or end of the inline box. Let's stretch the box as needed.
     setInlineBoxGeometry(layoutBox, inlineBoxBorderBox, false);
+}
+
+void InlineDisplayContentBuilder::appendInlineDisplayBoxAtBidiBoundary(const Box& layoutBox, DisplayBoxes& boxes)
+{
+    // Geometries for inline boxes at bidi boundaries are computed at a post-process step.
+    boxes.append({ m_lineIndex
+        , InlineDisplay::Box::Type::NonRootInlineBox
+        , layoutBox
+        , UBIDI_DEFAULT_LTR
+        , { }
+        , { }
+        , { }
+        , { }
+    });
 }
 
@@ -378 +398 @@
         return *lowestCommonAncestor;
     auto& enclosingDisplayBoxNodeForContainer = ensureDisplayBoxForContainer(containerBox.parent(), ancestorStack, boxes);
-    boxes.append({ m_lineIndex, InlineDisplay::Box::Type::NonRootInlineBox, containerBox, UBIDI_DEFAULT_LTR, { }, { }, { }, { }, true, { } });
+    appendInlineDisplayBoxAtBidiBoundary(containerBox, boxes);
     return createdDisplayBoxNodeForContainerBoxAndPushToAncestorStack(containerBox, boxes.size() - 1, enclosingDisplayBoxNodeForContainer, ancestorStack);
 }
@@ -404 +424 @@
         auto logicalRect = lineBox.logicalBorderBoxForInlineBox(layoutBox, boxGeometry);
         auto visualRect = InlineRect { lineBoxLogicalTop + logicalRect.top(), contentRightInVisualOrder, { }, logicalRect.height() };
-        // FIXME: Add support for ink overflow.
         if (!displayBox.isFirstForLayoutBox())
             return displayBox.setLogicalRect(visualRect, visualRect);
@@ -427 +446 @@
     };
     afterInlineBoxContent();
+
+    auto computeInkOverflow = [&] {
+        auto inkOverflow = displayBox.logicalRect();
+        m_contentHasInkOverflow = computeBoxShadowInkOverflow(!m_lineIndex ? layoutBox.firstLineStyle() : layoutBox.style(), inkOverflow) || m_contentHasInkOverflow;
+        displayBox.adjustInkOverflow(inkOverflow);
+    };
+    computeInkOverflow();
 
     setInlineBoxGeometry(layoutBox, displayBox.logicalRect(), displayBox.isFirstForLayoutBox());
@@ -499 +525 @@
             }
             if (lineRun.isInlineBoxStart() || lineRun.isLineSpanningInlineBoxStart()) {
-                boxes.append({ m_lineIndex, InlineDisplay::Box::Type::NonRootInlineBox, layoutBox, UBIDI_DEFAULT_LTR, { }, { }, { }, { }, true, { } });
+                appendInlineDisplayBoxAtBidiBoundary(layoutBox, boxes);
                 createdDisplayBoxNodeForContainerBoxAndPushToAncestorStack(downcast<ContainerBox>(layoutBox), boxes.size() - 1, parentDisplayBoxNode, ancestorStack);
                 continue;

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

@@ -60 +60 @@
     void appendInlineBoxDisplayBox(const Line::Run&, const InlineLevelBox&, const InlineRect&, bool linehasContent, DisplayBoxes&);
     void appendSpanningInlineBoxDisplayBox(const Line::Run&, const InlineLevelBox&, const InlineRect&, DisplayBoxes&);
+    void appendInlineDisplayBoxAtBidiBoundary(const Box&, DisplayBoxes&);
 
     void setInlineBoxGeometry(const Box&, const InlineRect&, bool isFirstInlineBoxFragment);