Changeset 252921 in webkit

Timestamp:

Nov 28, 2019 6:24:02 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Fix LineLayoutContext::shouldProcessUncommittedContent logic
​https://bugs.webkit.org/show_bug.cgi?id=204656
<rdar://problem/57511221>

Reviewed by Antti Koivisto.

Move the [text][text] and [ ][text] checks further down because we adjust the "lastUncomittedContent" by skipping [container start][container end] items.
(This was recently regressed at r252859)

• layout/inlineformatting/LineLayoutContext.cpp:

(WebCore::Layout::LineLayoutContext::shouldProcessUncommittedContent const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/LineLayoutContext.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-28  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Fix LineLayoutContext::shouldProcessUncommittedContent logic
+        https://bugs.webkit.org/show_bug.cgi?id=204656
+        <rdar://problem/57511221>
+
+        Reviewed by Antti Koivisto.
+
+        Move the [text][text] and [ ][text] checks further down because we adjust the "lastUncomittedContent" by skipping [container start][container end] items.  
+        (This was recently regressed at r252859)
+
+        * layout/inlineformatting/LineLayoutContext.cpp:
+        (WebCore::Layout::LineLayoutContext::shouldProcessUncommittedContent const):
+
 2019-11-28  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -255 +255 @@
         if (downcast<InlineTextItem>(inlineItem).isWhitespace())
             return true;
-        // texttext -> continuous content.
-        // ' 'text -> commit boundary.
-        if (lastUncomittedContent->isText())
-            return downcast<InlineTextItem>(*lastUncomittedContent).isWhitespace();
         // <span>text -> the inline container start and the text content form an unbreakable continuous content.
         if (lastUncomittedContent->isContainerStart())
@@ -280 +276 @@
                 return false;
         }
+        // texttext -> continuous content.
+        // ' 'text -> commit boundary.
+        if (lastUncomittedContent->isText())
+            return downcast<InlineTextItem>(*lastUncomittedContent).isWhitespace();
         // <img>text -> the inline box is on a commit boundary.
         if (lastUncomittedContent->isBox())