Changeset 34721 in webkit

Timestamp:

Jun 21, 2008 2:42:09 PM (16 years ago)

Author:

weinig@apple.com

Message:

WebCore:

2008-06-21 Sam Weinig <​sam@webkit.org>

Reviewed by Dan Bernstein.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=19647
REGRESSION: Problem with extjs (insertAdjacentHTML)

Test: fast/dynamic/insertAdjacentHTML-allowed-parents.html

• html/HTMLElement.cpp: (WebCore::HTMLElement::insertAdjacentHTML): Don't use innerHTML logic for creating the DocumentFragment from the html string.

LayoutTests:

2008-06-21 Sam Weinig <​sam@webkit.org>

Reviewed by Dan Bernstein.

Test for ​https://bugs.webkit.org/show_bug.cgi?id=19647
REGRESSION: Problem with extjs (insertAdjacentHTML)

• fast/dynamic/insertAdjacentHTML-allowed-parents-expected.txt: Added.
• fast/dynamic/insertAdjacentHTML-allowed-parents.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dynamic/insertAdjacentHTML-allowed-parents-expected.txt (added)
• LayoutTests/fast/dynamic/insertAdjacentHTML-allowed-parents.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-06-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=19647
+        REGRESSION: Problem with extjs (insertAdjacentHTML)
+
+        * fast/dynamic/insertAdjacentHTML-allowed-parents-expected.txt: Added.
+        * fast/dynamic/insertAdjacentHTML-allowed-parents.html: Added.
+
 2008-06-21  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-06-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=19647
+        REGRESSION: Problem with extjs (insertAdjacentHTML)
+
+        Test: fast/dynamic/insertAdjacentHTML-allowed-parents.html
+
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::insertAdjacentHTML): Don't use innerHTML logic for creating
+        the DocumentFragment from the html string.
+
 2008-06-21  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLElement.cpp

@@ -540 +540 @@
 void HTMLElement::insertAdjacentHTML(const String& where, const String& html, ExceptionCode& ec)
 {
-    // FIXME: perhaps this should use createFragmentFromMarkup() instead as
-    // createContextualFragment() has all sorts of odd rules in it.
-    RefPtr<DocumentFragment> fragment = createContextualFragment(html);
-    if (!fragment) {
-        ec = NO_MODIFICATION_ALLOWED_ERR;
-        return;
+    RefPtr<DocumentFragment> fragment = document()->createDocumentFragment();
+    if (document()->isHTMLDocument())
+         parseHTMLDocumentFragment(html, fragment.get());
+    else {
+        if (!parseXMLDocumentFragment(html, fragment.get(), this))
+            // FIXME: We should propagate a syntax error exception out here.
+            return;
     }