Changeset 283087 in webkit

Timestamp:

Sep 26, 2021, 6:47:42 AM (5 years ago)

Author:

Antti Koivisto

Message:

Line iterator firstRun/lastRun may return runs from wrong lines
​https://bugs.webkit.org/show_bug.cgi?id=230770
<rdar://problem/83509753>

Reviewed by Alan Bujtas.

Source/WebCore:

In some situation line iterator firstRun/lastRun could return runs from different lines.
This could lead to inconsistencies like firstRun being non-null while lastRun is null.

Test: editing/iterator-line-start-end.html

• layout/integration/LayoutIntegrationLineIteratorModernPath.h:

(WebCore::LayoutIntegration::LineIteratorModernPath::firstRun const):
(WebCore::LayoutIntegration::LineIteratorModernPath::lastRun const):

Take care to only return runs from this line.

LayoutTests:

• editing/iterator-line-start-end-expected.txt: Added.
• editing/iterator-line-start-end.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/iterator-line-start-end-expected.txt (added)
• LayoutTests/editing/iterator-line-start-end.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-09-26  Antti Koivisto  <antti@apple.com>
+
+        Line iterator firstRun/lastRun may return runs from wrong lines
+        https://bugs.webkit.org/show_bug.cgi?id=230770
+        <rdar://problem/83509753>
+
+        Reviewed by Alan Bujtas.
+
+        * editing/iterator-line-start-end-expected.txt: Added.
+        * editing/iterator-line-start-end.html: Added.
+
 2021-09-23  Tim Nguyen  <ntim@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-26  Antti Koivisto  <antti@apple.com>
+
+        Line iterator firstRun/lastRun may return runs from wrong lines
+        https://bugs.webkit.org/show_bug.cgi?id=230770
+        <rdar://problem/83509753>
+
+        Reviewed by Alan Bujtas.
+
+        In some situation line iterator firstRun/lastRun could return runs from different lines.
+        This could lead to inconsistencies like firstRun being non-null while lastRun is null.
+
+        Test: editing/iterator-line-start-end.html
+
+        * layout/integration/LayoutIntegrationLineIteratorModernPath.h:
+        (WebCore::LayoutIntegration::LineIteratorModernPath::firstRun const):
+        (WebCore::LayoutIntegration::LineIteratorModernPath::lastRun const):
+
+        Take care to only return runs from this line.
+
 2021-09-25  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h

@@ -103 +103 @@
         auto runIterator = RunIteratorModernPath { *m_inlineContent, line().firstBoxIndex() };
         if (runIterator.box().isInlineBox())
-            runIterator.traverseNextLeaf();
+            runIterator.traverseNextOnLine();
         return runIterator;
     }
@@ -114 +114 @@
         auto runIterator = RunIteratorModernPath { *m_inlineContent, line().firstBoxIndex() + boxCount - 1 };
         if (runIterator.box().isInlineBox())
-            runIterator.traversePreviousLeaf();
+            runIterator.traversePreviousOnLine();
         return runIterator;
     }