Changeset 251683 in webkit

Timestamp:

Oct 28, 2019 4:29:25 PM (4 years ago)

Author:

Chris Dumez

Message:

editing/firstPositionInNode-crash.html in crashing in Debug
​https://bugs.webkit.org/show_bug.cgi?id=203520

Reviewed by Ryosuke Niwa.

If positionInParentBeforeNode / positionInParentAfterNode on a node and editingIgnoresContent()
returns true for this node's parent, keep traversing ancestors until we find one for which
editingIgnoresContent() returns false.

No new tests, covered by editing/firstPositionInNode-crash.html.

• dom/Position.cpp:

(WebCore::positionInParentBeforeNode):
(WebCore::positionInParentAfterNode):

• dom/Position.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Position.cpp (modified) (1 diff)
• dom/Position.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-28  Chris Dumez  <cdumez@apple.com>
+
+        editing/firstPositionInNode-crash.html in crashing in Debug
+        https://bugs.webkit.org/show_bug.cgi?id=203520
+
+        Reviewed by Ryosuke Niwa.
+
+        If positionInParentBeforeNode / positionInParentAfterNode on a node and editingIgnoresContent()
+        returns true for this node's parent, keep traversing ancestors until we find one for which
+        editingIgnoresContent() returns false.
+
+        No new tests, covered by editing/firstPositionInNode-crash.html.
+
+        * dom/Position.cpp:
+        (WebCore::positionInParentBeforeNode):
+        (WebCore::positionInParentAfterNode):
+        * dom/Position.h:
+
 2019-10-28  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/dom/Position.cpp

@@ -1570 +1570 @@
 }
 
+Position positionInParentBeforeNode(Node* node)
+{
+    auto* ancestor = node->parentNode();
+    while (ancestor && editingIgnoresContent(*ancestor)) {
+        node = ancestor;
+        ancestor = ancestor->parentNode();
+    }
+    ASSERT(ancestor);
+    return Position(ancestor, node->computeNodeIndex(), Position::PositionIsOffsetInAnchor);
+}
+
+Position positionInParentAfterNode(Node* node)
+{
+    auto* ancestor = node->parentNode();
+    while (ancestor && editingIgnoresContent(*ancestor)) {
+        node = ancestor;
+        ancestor = ancestor->parentNode();
+    }
+    ASSERT(ancestor);
+    return Position(ancestor, node->computeNodeIndex() + 1, Position::PositionIsOffsetInAnchor);
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/dom/Position.h

@@ -264 +264 @@
 }
 
-inline Position positionInParentBeforeNode(const Node* node)
-{
-    ASSERT(node->parentNode());
-    return Position(node->parentNode(), node->computeNodeIndex(), Position::PositionIsOffsetInAnchor);
-}
-
-inline Position positionInParentAfterNode(const Node* node)
-{
-    ASSERT(node->parentNode());
-    return Position(node->parentNode(), node->computeNodeIndex() + 1, Position::PositionIsOffsetInAnchor);
-}
+Position positionInParentBeforeNode(Node*);
+Position positionInParentAfterNode(Node*);
 
 // positionBeforeNode and positionAfterNode return neighbor-anchored positions, construction is O(1)