Changeset 87863 in webkit

Timestamp:

Jun 1, 2011, 4:13:53 PM (15 years ago)

Author:

inferno@chromium.org

Message:

2011-06-01 Abhishek Arya <​inferno@chromium.org>

Reviewed by Alexey Proskuryakov.

Fix setting of document.body
​https://bugs.webkit.org/show_bug.cgi?id=60831

1. Only allowing setting to an element if it has a body tag.
2. If element is from another document, import it.

Test: fast/dom/document-set-body.html

• dom/Document.cpp: (WebCore::Document::setBody):

2011-06-01 Abhishek Arya <​inferno@chromium.org>

Reviewed by Alexey Proskuryakov.

Tests setting document.body to non body elements, elements in other
documents.
​https://bugs.webkit.org/show_bug.cgi?id=60831

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/document-set-body-expected.txt (added)
• LayoutTests/fast/dom/document-set-body.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-01  Abhishek Arya  <inferno@chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Tests setting document.body to non body elements, elements in other
+        documents.
+        https://bugs.webkit.org/show_bug.cgi?id=60831
+
+        * fast/dom/document-set-body-expected.txt: Added.
+        * fast/dom/document-set-body.html: Added.
+
 2011-06-01  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-01  Abhishek Arya  <inferno@chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix setting of document.body
+        https://bugs.webkit.org/show_bug.cgi?id=60831
+
+        1. Only allowing setting to an element if it has a body tag.
+        2. If element is from another document, import it.
+
+        Test: fast/dom/document-set-body.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::setBody):
+
 2011-06-01  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -2032 +2032 @@
 void Document::setBody(PassRefPtr<HTMLElement> newBody, ExceptionCode& ec)
 {
-    if (!newBody || !documentElement()) { 
+    ec = 0;
+
+    if (!newBody || !documentElement() || !newBody->hasTagName(bodyTag)) { 
         ec = HIERARCHY_REQUEST_ERR;
         return;
+    }
+
+    if (newBody->document() && newBody->document() != this) {
+        RefPtr<Node> node = importNode(newBody.get(), true, ec);
+        if (ec)
+            return;
+        
+        newBody = toHTMLElement(node.get());
     }