Title: [284665] trunk
Revision
284665
Author
[email protected]
Date
2021-10-21 21:52:50 -0700 (Thu, 21 Oct 2021)

Log 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 <[email protected]> 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.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (284664 => 284665)


--- trunk/LayoutTests/ChangeLog	2021-10-22 04:31:45 UTC (rev 284664)
+++ trunk/LayoutTests/ChangeLog	2021-10-22 04:52:50 UTC (rev 284665)
@@ -1,3 +1,13 @@
+2021-10-21  Gabriel Nava Marino  <[email protected]>
+
+        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  <[email protected]>
 
         Form submission should be cancelled if the form gets detached from inside the formdata event handler

Added: trunk/LayoutTests/fast/clip/clip-hit-null-iterator-path-comparison-expected.txt (0 => 284665)


--- trunk/LayoutTests/fast/clip/clip-hit-null-iterator-path-comparison-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/clip/clip-hit-null-iterator-path-comparison-expected.txt	2021-10-22 04:52:50 UTC (rev 284665)
@@ -0,0 +1 @@
+ PASS

Added: trunk/LayoutTests/fast/clip/clip-hit-null-iterator-path-comparison.html (0 => 284665)


--- trunk/LayoutTests/fast/clip/clip-hit-null-iterator-path-comparison.html	                        (rev 0)
+++ trunk/LayoutTests/fast/clip/clip-hit-null-iterator-path-comparison.html	2021-10-22 04:52:50 UTC (rev 284665)
@@ -0,0 +1,12 @@
+<style>
+  ::first-line {
+    background-clip: text;
+  }
+</style>
+<input>
+PASS
+<script>
+  if (window.testRunner)
+      testRunner.dumpAsText();
+</script>
+

Modified: trunk/Source/WebCore/ChangeLog (284664 => 284665)


--- trunk/Source/WebCore/ChangeLog	2021-10-22 04:31:45 UTC (rev 284664)
+++ trunk/Source/WebCore/ChangeLog	2021-10-22 04:52:50 UTC (rev 284665)
@@ -1,3 +1,15 @@
+2021-10-21  Gabriel Nava Marino  <[email protected]>
+
+        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  <[email protected]>
 
         Clean up some code around checking the state of Watchpoints

Modified: trunk/Source/WebCore/layout/integration/InlineIteratorBox.cpp (284664 => 284665)


--- trunk/Source/WebCore/layout/integration/InlineIteratorBox.cpp	2021-10-22 04:31:45 UTC (rev 284664)
+++ trunk/Source/WebCore/layout/integration/InlineIteratorBox.cpp	2021-10-22 04:52:50 UTC (rev 284665)
@@ -48,6 +48,9 @@
 
 bool BoxIterator::operator==(const BoxIterator& other) const
 {
+    if (atEnd() && other.atEnd())
+        return true;
+
     return m_box.m_pathVariant == other.m_box.m_pathVariant;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to