Changeset 81185 in webkit

Timestamp:

Mar 15, 2011 3:37:47 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-03-15 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Tony Chang.

Crash in ReplaceSelectionCommand::doApply when inserting a node under a document node
​https://bugs.webkit.org/show_bug.cgi?id=56372

The bug was caused by insertNodeAfter's calling parentElement on document's child.
Fixed this by changing the node that AppendNodeCommand takes.

There was also a bug that document node always returned false for isContentEditable
and isContentRichlyEditable because they never overrode Node's default implementation.
Fixed this by overriding them in Document.

Test: editing/execCommand/append-node-under-document.html

• dom/Document.cpp: (WebCore::Document::isContentEditable): Added. (WebCore::Document::isContentRichlyEditable): Added.
• dom/Document.h:
• editing/AppendNodeCommand.cpp: (WebCore::AppendNodeCommand::AppendNodeCommand): Takes ContainerNode instead of Element.
• editing/AppendNodeCommand.h: (WebCore::AppendNodeCommand::create): Ditto.
• editing/CompositeEditCommand.cpp: (WebCore::CompositeEditCommand::appendNode): Ditto. (WebCore::CompositeEditCommand::insertNodeAfter): Calls parentNode instead of parentElement.
• editing/CompositeEditCommand.h:

2011-03-15 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Tony Chang.

Crash in ReplaceSelectionCommand::doApply when inserting a node under a document node
​https://bugs.webkit.org/show_bug.cgi?id=56372

Added a test to ensure WebKit does not crash when appending a node to a document
that has only two nested iframes.

• editing/execCommand/append-node-under-document-expected.txt: Added.
• editing/execCommand/append-node-under-document.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/append-node-under-document-expected.txt (added)
• LayoutTests/editing/execCommand/append-node-under-document.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/dom/Document.h (modified) (1 diff)
• Source/WebCore/editing/AppendNodeCommand.cpp (modified) (1 diff)
• Source/WebCore/editing/AppendNodeCommand.h (modified) (2 diffs)
• Source/WebCore/editing/CompositeEditCommand.cpp (modified) (2 diffs)
• Source/WebCore/editing/CompositeEditCommand.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-15  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Tony Chang.
+
+        Crash in ReplaceSelectionCommand::doApply when inserting a node under a document node
+        https://bugs.webkit.org/show_bug.cgi?id=56372
+
+        Added a test to ensure WebKit does not crash when appending a node to a document
+        that has only two nested iframes.
+
+        * editing/execCommand/append-node-under-document-expected.txt: Added.
+        * editing/execCommand/append-node-under-document.html: Added.
+
 2011-03-15  David Levin  <levin@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-15  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Tony Chang.
+
+        Crash in ReplaceSelectionCommand::doApply when inserting a node under a document node
+        https://bugs.webkit.org/show_bug.cgi?id=56372
+
+        The bug was caused by insertNodeAfter's calling parentElement on document's child.
+        Fixed this by changing the node that AppendNodeCommand takes.
+
+        There was also a bug that document node always returned false for isContentEditable
+        and isContentRichlyEditable because they never overrode Node's default implementation.
+        Fixed this by overriding them in Document.
+
+        Test: editing/execCommand/append-node-under-document.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::isContentEditable): Added.
+        (WebCore::Document::isContentRichlyEditable): Added.
+        * dom/Document.h:
+        * editing/AppendNodeCommand.cpp:
+        (WebCore::AppendNodeCommand::AppendNodeCommand): Takes ContainerNode instead of Element.
+        * editing/AppendNodeCommand.h:
+        (WebCore::AppendNodeCommand::create): Ditto.
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::appendNode): Ditto.
+        (WebCore::CompositeEditCommand::insertNodeAfter): Calls parentNode instead of parentElement.
+        * editing/CompositeEditCommand.h:
+
 2011-03-15  David Grogan  <dgrogan@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4118 +4118 @@
 }
 
+bool Document::isContentEditable() const
+{
+    if (inDesignMode())
+        return true;
+
+    return renderer() && (renderer()->style()->userModify() == READ_WRITE || renderer()->style()->userModify() == READ_WRITE_PLAINTEXT_ONLY);
+}
+
+bool Document::isContentRichlyEditable() const
+{
+    if (inDesignMode())
+        return true;
+
+    return renderer() && renderer()->style()->userModify() == READ_WRITE;
+}
+
 Document* Document::parentDocument() const
 {

trunk/Source/WebCore/dom/Document.h

@@ -895 +895 @@
     InheritedBool getDesignMode() const;
     bool inDesignMode() const;
+    virtual bool isContentEditable() const;
+    virtual bool isContentRichlyEditable() const;
 
     Document* parentDocument() const;

trunk/Source/WebCore/editing/AppendNodeCommand.cpp

@@ -32 +32 @@
 namespace WebCore {
 
-AppendNodeCommand::AppendNodeCommand(PassRefPtr<Element> parent, PassRefPtr<Node> node)
+AppendNodeCommand::AppendNodeCommand(PassRefPtr<ContainerNode> parent, PassRefPtr<Node> node)
     : SimpleEditCommand(parent->document())
     , m_parent(parent)

trunk/Source/WebCore/editing/AppendNodeCommand.h

@@ -33 +33 @@
 class AppendNodeCommand : public SimpleEditCommand {
 public:
-    static PassRefPtr<AppendNodeCommand> create(PassRefPtr<Element> parent, PassRefPtr<Node> node)
+    static PassRefPtr<AppendNodeCommand> create(PassRefPtr<ContainerNode> parent, PassRefPtr<Node> node)
     {
         return adoptRef(new AppendNodeCommand(parent, node));
@@ -39 +39 @@
 
 private:
-    AppendNodeCommand(PassRefPtr<Element> parent, PassRefPtr<Node> node);
+    AppendNodeCommand(PassRefPtr<ContainerNode> parent, PassRefPtr<Node>);
 
     virtual void doApply();
     virtual void doUnapply();
 
-    RefPtr<Element> m_parent;
+    RefPtr<ContainerNode> m_parent;
     RefPtr<Node> m_node;
 };

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -145 +145 @@
     ASSERT(refChild);
     ASSERT(!refChild->hasTagName(bodyTag));
-    Element* parent = refChild->parentElement();
+    ContainerNode* parent = refChild->parentNode();
     ASSERT(parent);
     if (parent->lastChild() == refChild)
@@ -185 +185 @@
 }
 
-void CompositeEditCommand::appendNode(PassRefPtr<Node> node, PassRefPtr<Element> parent)
+void CompositeEditCommand::appendNode(PassRefPtr<Node> node, PassRefPtr<ContainerNode> parent)
 {
     ASSERT(canHaveChildrenForEditing(parent.get()));

trunk/Source/WebCore/editing/CompositeEditCommand.h

@@ -50 +50 @@
     // sugary-sweet convenience functions to help create and apply edit commands in composite commands
     //
-    void appendNode(PassRefPtr<Node>, PassRefPtr<Element> parent);
+    void appendNode(PassRefPtr<Node>, PassRefPtr<ContainerNode> parent);
     void applyCommandToComposite(PassRefPtr<EditCommand>);
     void applyStyle(const EditingStyle*, EditAction = EditActionChangeAttributes);