Changeset 85374 in webkit

Timestamp:

Apr 29, 2011 5:23:01 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-04-29 Emil Eklund <​eae@chromium.org>

Reviewed by Tony Chang.

Setting outerHTML should merge text nodes
​https://bugs.webkit.org/show_bug.cgi?id=52686

Add test for setting Element.outerHTML.

• fast/dom/set-outer-html-expected.txt: Added.
• fast/dom/set-outer-html.html: Added.

2011-04-29 Emil Eklund <​eae@chromium.org>

Reviewed by Tony Chang.

Setting outerHTML should merge text nodes
​https://bugs.webkit.org/show_bug.cgi?id=52686

When setting outerHTML adjacent text nodes should be merged. This matches
the behavior of outerText and the IE implementation of outerHTML.

Test: fast/dom/set-outer-html.html

• html/HTMLElement.cpp: (WebCore::mergeWithNextTextNode): Move function to before setOuterHTML. (WebCore::HTMLElement::setOuterHTML): Merge adjacent text nodes after replacing the element.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/set-outer-html-expected.txt (added)
• LayoutTests/fast/dom/set-outer-html.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLElement.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-29  Emil Eklund  <eae@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Setting outerHTML should merge text nodes
+        https://bugs.webkit.org/show_bug.cgi?id=52686
+        
+        Add test for setting Element.outerHTML.
+
+        * fast/dom/set-outer-html-expected.txt: Added.
+        * fast/dom/set-outer-html.html: Added.
+
 2011-04-29  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-29  Emil Eklund  <eae@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Setting outerHTML should merge text nodes
+        https://bugs.webkit.org/show_bug.cgi?id=52686
+
+        When setting outerHTML adjacent text nodes should be merged. This matches
+        the behavior of outerText and the IE implementation of outerHTML.       
+
+        Test: fast/dom/set-outer-html.html
+
+        * html/HTMLElement.cpp:
+        (WebCore::mergeWithNextTextNode): Move function to before setOuterHTML.
+        (WebCore::HTMLElement::setOuterHTML): Merge adjacent text nodes after replacing the element.
+
 2011-04-29  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -361 +361 @@
 }
 
+static void mergeWithNextTextNode(PassRefPtr<Node> node, ExceptionCode& ec)
+{
+    ASSERT(node && node->isTextNode());
+    Node* next = node->nextSibling();
+    if (!next || !next->isTextNode())
+        return;
+    
+    RefPtr<Text> textNode = static_cast<Text*>(node.get());
+    RefPtr<Text> textNext = static_cast<Text*>(next);
+    textNode->appendData(textNext->data(), ec);
+    if (ec)
+        return;
+    if (textNext->parentNode()) // Might have been removed by mutation event.
+        textNext->remove(ec);
+}
+
 void HTMLElement::setOuterHTML(const String& html, ExceptionCode& ec)
 {
@@ -368 +384 @@
         return;
     }
-    HTMLElement* parent = toHTMLElement(p);
-
-    RefPtr<DocumentFragment> fragment = createFragmentFromSource(html, parent, ec);
-    if (fragment) {
-        // FIXME: Why doesn't this have code to merge neighboring text nodes the way setOuterText does?
-        parent->replaceChild(fragment.release(), this, ec);
-    }
+    RefPtr<HTMLElement> parent = static_cast<HTMLElement*>(p);
+    RefPtr<Node> prev = previousSibling();
+    RefPtr<Node> next = nextSibling();
+
+    RefPtr<DocumentFragment> fragment = createFragmentFromSource(html, parent.get(), ec);
+    if (ec)
+        return;
+      
+    parent->replaceChild(fragment.release(), this, ec);
+    RefPtr<Node> node = next ? next->previousSibling() : 0;
+    if (!ec && node && node->isTextNode())
+        mergeWithNextTextNode(node.release(), ec);
+
+    if (!ec && prev && prev->isTextNode())
+        mergeWithNextTextNode(prev.release(), ec);
 }
 
@@ -456 +480 @@
     if (!ec)
         replaceChildrenWithFragment(this, fragment.release(), ec);
-}
-
-static void mergeWithNextTextNode(PassRefPtr<Node> node, ExceptionCode& ec)
-{
-    ASSERT(node && node->isTextNode());
-    Node* next = node->nextSibling();
-    if (!next || !next->isTextNode())
-        return;
-    
-    RefPtr<Text> textNode = static_cast<Text*>(node.get());
-    RefPtr<Text> textNext = static_cast<Text*>(next);
-    textNode->appendData(textNext->data(), ec);
-    if (ec)
-        return;
-    if (textNext->parentNode()) // Might have been removed by mutation event.
-        textNext->remove(ec);
 }