Changeset 94832 in webkit

Timestamp:

Sep 8, 2011 9:03:21 PM (13 years ago)

Author:

sullivan@chromium.org

Message:

Crashes in WebCore::InsertNodeBeforeCommand constructor.
​https://bugs.webkit.org/show_bug.cgi?id=67763

Reviewed by Ryosuke Niwa.

Source/WebCore:

Changes editableRootForPosition() to use the position's containerNode instead of deprecatedNode so that
positions which are before or after a given node cannot return that node as the editable root.

Test: editing/inserting/insert-paragraph-selection-outside-contenteditable.html

• editing/htmlediting.cpp:

(WebCore::editableRootForPosition): use containerNode instead of deprecatedNode.

LayoutTests:

Tests for crash when the selection is outside the contenteditable node.

• editing/inserting/insert-paragraph-selection-outside-contenteditable-expected.txt: Added.
• editing/inserting/insert-paragraph-selection-outside-contenteditable.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/insert-paragraph-selection-outside-contenteditable-expected.txt (added)
• LayoutTests/editing/inserting/insert-paragraph-selection-outside-contenteditable.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/htmlediting.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-08  Annie Sullivan  <sullivan@chromium.org>
+
+        Crashes in WebCore::InsertNodeBeforeCommand constructor.
+        https://bugs.webkit.org/show_bug.cgi?id=67763
+
+        Reviewed by Ryosuke Niwa.
+
+        Tests for crash when the selection is outside the contenteditable node.
+
+        * editing/inserting/insert-paragraph-selection-outside-contenteditable-expected.txt: Added.
+        * editing/inserting/insert-paragraph-selection-outside-contenteditable.html: Added.
+
 2011-09-08  Daniel Bates  <dbates@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-08  Annie Sullivan  <sullivan@chromium.org>
+
+        Crashes in WebCore::InsertNodeBeforeCommand constructor.
+        https://bugs.webkit.org/show_bug.cgi?id=67763
+
+        Reviewed by Ryosuke Niwa.
+
+        Changes editableRootForPosition() to use the position's containerNode instead of deprecatedNode so that
+        positions which are before or after a given node cannot return that node as the editable root.
+
+        Test: editing/inserting/insert-paragraph-selection-outside-contenteditable.html
+
+        * editing/htmlediting.cpp:
+        (WebCore::editableRootForPosition): use containerNode instead of deprecatedNode.
+
 2011-09-08  James Weatherall  <wez@chromium.org>
 

trunk/Source/WebCore/editing/htmlediting.cpp

@@ -177 +177 @@
 Element* editableRootForPosition(const Position& p)
 {
-    Node* node = p.deprecatedNode();
+    Node* node = p.containerNode();
     if (!node)
         return 0;