Changeset 284665 in webkit

Timestamp:

Oct 21, 2021, 9:52:50 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Two null box iterators from different paths fail to compare equal
​https://bugs.webkit.org/show_bug.cgi?id=232093

Patch by Gabriel Nava Marino <​gnavamarino@apple.com> on 2021-10-21
Reviewed by Antti Koivisto.

Source/WebCore:

Test: fast/clip/clip-hit-null-iterator-path-comparison.html

• layout/integration/InlineIteratorBox.cpp:

(WebCore::InlineIterator::BoxIterator::operator== const):

LayoutTests:

• fast/clip/clip-hit-null-iterator-path-comparison-expected.txt: Added.
• fast/clip/clip-hit-null-iterator-path-comparison.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/clip/clip-hit-null-iterator-path-comparison-expected.txt (added)
• LayoutTests/fast/clip/clip-hit-null-iterator-path-comparison.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/integration/InlineIteratorBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-21  Gabriel Nava Marino  <gnavamarino@apple.com>
+
+        Two null box iterators from different paths fail to compare equal
+        https://bugs.webkit.org/show_bug.cgi?id=232093
+
+        Reviewed by Antti Koivisto.
+
+        * fast/clip/clip-hit-null-iterator-path-comparison-expected.txt: Added.
+        * fast/clip/clip-hit-null-iterator-path-comparison.html: Added.
+
 2021-10-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-21  Gabriel Nava Marino  <gnavamarino@apple.com>
+
+        Two null box iterators from different paths fail to compare equal
+        https://bugs.webkit.org/show_bug.cgi?id=232093
+
+        Reviewed by Antti Koivisto.
+
+        Test: fast/clip/clip-hit-null-iterator-path-comparison.html
+
+        * layout/integration/InlineIteratorBox.cpp:
+        (WebCore::InlineIterator::BoxIterator::operator== const):
+
 2021-10-21  Saam Barati  <sbarati@apple.com>
 

trunk/Source/WebCore/layout/integration/InlineIteratorBox.cpp

@@ -49 +49 @@
 bool BoxIterator::operator==(const BoxIterator& other) const
 {
+    if (atEnd() && other.atEnd())
+        return true;
+
     return m_box.m_pathVariant == other.m_box.m_pathVariant;
 }