Changeset 267001 in webkit

Timestamp:

Sep 13, 2020 12:18:42 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Create LineBox::InlineBox for [ContainerEnd] runs forced to the next line.
​https://bugs.webkit.org/show_bug.cgi?id=216462

Reviewed by Antti Koivisto.

Normally the [container end] run forms a continous content with the runs in front of it
(there's no breaking opportunity between e.g the last text run and the [container end] run).
However in certain cases the [container end] run may be forced over to the next line.
e.g.
<span>the [container end] run is forced over to the next line<br></span>over here
runs: [container start][text run][line break run]<-new line->[container end][text run]

• layout/inlineformatting/InlineLineBox.cpp:

(WebCore::Layout::LineBox::constructInlineBoxes):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLineBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-13  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Create LineBox::InlineBox for [ContainerEnd] runs forced to the next line.
+        https://bugs.webkit.org/show_bug.cgi?id=216462
+
+        Reviewed by Antti Koivisto.
+
+        Normally the [container end] run forms a continous content with the runs in front of it 
+        (there's no breaking opportunity between e.g the last text run and the [container end] run).
+        However in certain cases the [container end] run may be forced over to the next line.
+        e.g.
+        <span>the [container end] run is forced over to the next line<br></span>over here
+        runs: [container start][text run][line break run]<-new line->[container end][text run]
+
+        * layout/inlineformatting/InlineLineBox.cpp:
+        (WebCore::Layout::LineBox::constructInlineBoxes):
+
 2020-09-13  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineLineBox.cpp

@@ -190 +190 @@
         // We only have to do it on the first run as any subsequent inline content is either at the same/higher nesting level or
         // nested with a [container start] run.
-        auto& firstRunParentInlineBox = runs[0].layoutBox().parent();
-        // If the parent is the root(), we can stop here. This is root inline box content, there's no nesting inline box from the previous line(s).
-        if (&firstRunParentInlineBox != &root()) {
+        auto& firstRun = runs[0];
+        auto& firstRunParentInlineBox = firstRun.layoutBox().parent();
+        // If the parent is the root(), we can stop here. This is root inline box content, there's no nesting inline box from the previous line(s)
+        // unless the inline box closing (container end run) is forced over to the current line.
+        // e.g.
+        // <span>normally the inline box closing forms a continuous content</span>
+        // <span>unless it's forced to the next line<br></span>
+        if (firstRun.isContainerEnd() || &firstRunParentInlineBox != &root()) {
             auto* ancestor = &firstRunParentInlineBox;
             Vector<const Box*> ancestorsWithoutInlineBoxes;