Changeset 243621 in webkit

Timestamp:

Mar 28, 2019, 2:23:49 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

Debug assert in DOMSelection::containsNode when node belongs to a different tree
​https://bugs.webkit.org/show_bug.cgi?id=196342

Reviewed by Antti Koivisto.

Source/WebCore:

The assertion was wrong. It's possible for Range::compareBoundaryPoints to return WRONG_DOCUMENT_ERR
when the node and the start container belong to two different trees.

Return false in such a case for now since it's unclear (unspecified) what these methods on Selection
should do with respect to shadow trees, preserving the current behavior of release builds.

Test: editing/selection/containsNode-with-no-common-ancestor.html

• page/DOMSelection.cpp:

(WebCore::DOMSelection::containsNode const):

LayoutTests:

Added a regression test to catch the debug assertion failure. The test always passed in release builds.

• editing/selection/containsNode-with-no-common-ancestor-expected.txt: Added.
• editing/selection/containsNode-with-no-common-ancestor.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/containsNode-with-no-common-ancestor-expected.txt (added)
• LayoutTests/editing/selection/containsNode-with-no-common-ancestor.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/DOMSelection.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Debug assert in DOMSelection::containsNode when node belongs to a different tree
+        https://bugs.webkit.org/show_bug.cgi?id=196342
+
+        Reviewed by Antti Koivisto.
+
+        Added a regression test to catch the debug assertion failure. The test always passed in release builds.
+
+        * editing/selection/containsNode-with-no-common-ancestor-expected.txt: Added.
+        * editing/selection/containsNode-with-no-common-ancestor.html: Added.
+
 2019-03-28  Shawn Roberts  <sroberts@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Debug assert in DOMSelection::containsNode when node belongs to a different tree
+        https://bugs.webkit.org/show_bug.cgi?id=196342
+
+        Reviewed by Antti Koivisto.
+
+        The assertion was wrong. It's possible for Range::compareBoundaryPoints to return WRONG_DOCUMENT_ERR
+        when the node and the start container belong to two different trees.
+
+        Return false in such a case for now since it's unclear (unspecified) what these methods on Selection
+        should do with respect to shadow trees, preserving the current behavior of release builds.
+
+        Test: editing/selection/containsNode-with-no-common-ancestor.html
+
+        * page/DOMSelection.cpp:
+        (WebCore::DOMSelection::containsNode const):
+
 2019-03-28  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/page/DOMSelection.cpp

@@ -416 +416 @@
 
     auto startsResult = Range::compareBoundaryPoints(parentNode, nodeIndex, &selectedRange->startContainer(), selectedRange->startOffset());
-    ASSERT(!startsResult.hasException());
+    if (startsResult.hasException())
+        return false;
+
     auto endsResult = Range::compareBoundaryPoints(parentNode, nodeIndex + 1, &selectedRange->endContainer(), selectedRange->endOffset());
     ASSERT(!endsResult.hasException());