Changeset 86364 in webkit

Timestamp:

May 12, 2011 11:29:01 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-05-12 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

REGRESSION (r65868): createContextualFragment does not work with <style>
​https://bugs.webkit.org/show_bug.cgi?id=60155

These test results match Firefox.

• fast/parser/style-in-create-contextual-fragment-expected.txt: Added.
• fast/parser/style-in-create-contextual-fragment-head-expected.txt: Added.
• fast/parser/style-in-create-contextual-fragment-head.html: Added.
• fast/parser/style-in-create-contextual-fragment.html: Added.

2011-05-12 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

REGRESSION (r65868): createContextualFragment does not work with <style>
​https://bugs.webkit.org/show_bug.cgi?id=60155

createContextualFragment doesn't have a spec, so it's hard to tell what
we're supposed to do exactly. This patch appears to make our behavior
more like Firefox and should fix the compat issue with this site.

Tests: fast/parser/style-in-create-contextual-fragment-head.html

fast/parser/style-in-create-contextual-fragment.html

• dom/Element.cpp: (WebCore::Element::deprecatedCreateContextualFragment):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/parser/style-in-create-contextual-fragment-expected.txt (added)
• LayoutTests/fast/parser/style-in-create-contextual-fragment-head-expected.txt (added)
• LayoutTests/fast/parser/style-in-create-contextual-fragment-head.html (added)
• LayoutTests/fast/parser/style-in-create-contextual-fragment.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-12  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION (r65868): createContextualFragment does not work with <style>
+        https://bugs.webkit.org/show_bug.cgi?id=60155
+
+        These test results match Firefox.
+
+        * fast/parser/style-in-create-contextual-fragment-expected.txt: Added.
+        * fast/parser/style-in-create-contextual-fragment-head-expected.txt: Added.
+        * fast/parser/style-in-create-contextual-fragment-head.html: Added.
+        * fast/parser/style-in-create-contextual-fragment.html: Added.
+
 2011-05-12  David Grogan  <dgrogan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-12  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION (r65868): createContextualFragment does not work with <style>
+        https://bugs.webkit.org/show_bug.cgi?id=60155
+
+        createContextualFragment doesn't have a spec, so it's hard to tell what
+        we're supposed to do exactly.  This patch appears to make our behavior
+        more like Firefox and should fix the compat issue with this site.
+
+        Tests: fast/parser/style-in-create-contextual-fragment-head.html
+               fast/parser/style-in-create-contextual-fragment.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::deprecatedCreateContextualFragment):
+
 2011-05-12  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -155 +155 @@
     for (RefPtr<Node> node = fragment->firstChild(); node; node = nextNode) {
         nextNode = node->nextSibling();
-        if (node->hasTagName(htmlTag) || node->hasTagName(bodyTag)) {
+        if (node->hasTagName(htmlTag) || node->hasTagName(headTag) || node->hasTagName(bodyTag)) {
             HTMLElement* element = toHTMLElement(node.get());
             Node* firstChild = element->firstChild();
@@ -170 +170 @@
             fragment->removeChild(element, ignoredExceptionCode);
             ASSERT(!ignoredExceptionCode);
-        } else if (node->hasTagName(headTag)) {
-            fragment->removeChild(node.get(), ignoredExceptionCode);
-            ASSERT(!ignoredExceptionCode);
         }
     }
     return fragment.release();
 }
-    
+
 PassRefPtr<Node> Element::cloneNode(bool deep)
 {