<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202893] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202893">202893</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-06 21:14:28 -0700 (Wed, 06 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Align Document.body setter with the HTML specification
https://bugs.webkit.org/show_bug.cgi?id=159490
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
Rebaseline existing W3C test now that one more check is passing.
* web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body-expected.txt:
Source/WebCore:
Align Document.body setter with the HTML specification:
- https://html.spec.whatwg.org/multipage/dom.html#dom-document-body
In particular, the following web-exposed changes were made:
- It is now possible to set document.body to a frameset element.
- We no longer call importNode() on the passed in body. Therefore,
if the body comes from another document, its will be adopted /
transferred rather than cloned.
Both changes match the behavior of Firefox and Chrome.
No new tests, updated / rebaselined existing tests.
* dom/Document.cpp:
(WebCore::Document::setBodyOrFrameset):
LayoutTests:
Update existing test that was setting a document's body to another frame's body
as it was expecting the body element to get cloned rather than adopted / transferred.
* fast/dom/document-set-body-expected.txt:
* fast/dom/document-set-body.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomdocumentsetbodyexpectedtxt">trunk/LayoutTests/fast/dom/document-set-body-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomdocumentsetbodyhtml">trunk/LayoutTests/fast/dom/document-set-body.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldomdocumentsdomtreeaccessorsDocumentbodyexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomdocumentsetbodynullexpectedtxt">trunk/LayoutTests/fast/dom/document-set-body-null-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomdocumentsetbodynullhtml">trunk/LayoutTests/fast/dom/document-set-body-null.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202892 => 202893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-07 03:38:48 UTC (rev 202892)
+++ trunk/LayoutTests/ChangeLog 2016-07-07 04:14:28 UTC (rev 202893)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-06 Chris Dumez <cdumez@apple.com>
+
+ Align Document.body setter with the HTML specification
+ https://bugs.webkit.org/show_bug.cgi?id=159490
+
+ Reviewed by Alex Christensen.
+
+ Update existing test that was setting a document's body to another frame's body
+ as it was expecting the body element to get cloned rather than adopted / transferred.
+
+ * fast/dom/document-set-body-expected.txt:
+ * fast/dom/document-set-body.html:
+
</ins><span class="cx"> 2016-07-06 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Return values of JSArray::createUninitialized (and related) are not consistently checked for nullptr
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomdocumentsetbodyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/document-set-body-expected.txt (202892 => 202893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/document-set-body-expected.txt 2016-07-07 03:38:48 UTC (rev 202892)
+++ trunk/LayoutTests/fast/dom/document-set-body-expected.txt 2016-07-07 04:14:28 UTC (rev 202893)
</span><span class="lines">@@ -1,14 +1,14 @@
</span><del>-Tests setting document.body
</del><ins>+Tests setting document.body to another frame's body
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS document1.body = iframe1 threw exception Error: HierarchyRequestError: DOM Exception 3.
-PASS iframe1.parentNode is document.body
-PASS document1.body = document1.createElement('iframe') threw exception Error: HierarchyRequestError: DOM Exception 3.
-PASS document1.body != document.body is true
-PASS document1.body is body1
</del><ins>+PASS document1.body is not null
+PASS document2.body is null
+PASS document2.body = document1.body did not throw exception.
+PASS document2.body is not null
+PASS document1.body is null
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-
</del><ins>+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomdocumentsetbodynullexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/document-set-body-null-expected.txt (0 => 202893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/document-set-body-null-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/document-set-body-null-expected.txt 2016-07-07 04:14:28 UTC (rev 202893)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests setting document.body to null
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testDocument.body = null threw exception Error: HierarchyRequestError: DOM Exception 3.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomdocumentsetbodynullhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/document-set-body-null.html (0 => 202893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/document-set-body-null.html (rev 0)
+++ trunk/LayoutTests/fast/dom/document-set-body-null.html 2016-07-07 04:14:28 UTC (rev 202893)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<iframe id="testFrame" srcdoc="<html><body></body></html>"></iframe>
+<script>
+description("Tests setting document.body to null");
+
+var testDocument = document.getElementById("testFrame").contentDocument;
+shouldThrow("testDocument.body = null", "'Error: HierarchyRequestError: DOM Exception 3'");
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomdocumentsetbodyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/document-set-body.html (202892 => 202893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/document-set-body.html 2016-07-07 03:38:48 UTC (rev 202892)
+++ trunk/LayoutTests/fast/dom/document-set-body.html 2016-07-07 04:14:28 UTC (rev 202893)
</span><span class="lines">@@ -1,27 +1,27 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
</del><ins>+<!DOCTYPE html>
</ins><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><ins>+<iframe id="testFrame1" srcdoc="<html><body></body></html>"></iframe>
+<iframe id="testFrame2" srcdoc="<html></html>"></iframe>
</ins><span class="cx"> <script>
</span><del>-description("Tests setting document.body");
</del><ins>+description("Tests setting document.body to another frame's body");
</ins><span class="cx">
</span><del>-iframe1 = document.createElement('iframe');
-document.body.appendChild(iframe1);
-document1 = iframe1.contentDocument.implementation.createHTMLDocument("document");
</del><ins>+var document1 = document.getElementById("testFrame1").contentDocument;
+var document2 = document.getElementById("testFrame2").contentDocument;
+if (document2.body)
+ document2.documentElement.removeChild(document2.body);
</ins><span class="cx">
</span><del>-shouldThrow("document1.body = iframe1", "'Error: HierarchyRequestError: DOM Exception 3'");
-shouldBe("iframe1.parentNode", "document.body");
</del><ins>+shouldNotBe("document1.body", "null");
+shouldBeNull("document2.body");
</ins><span class="cx">
</span><del>-shouldThrow("document1.body = document1.createElement('iframe')", "'Error: HierarchyRequestError: DOM Exception 3'");
</del><ins>+shouldNotThrow("document2.body = document1.body");
</ins><span class="cx">
</span><del>-document1.body = document.body;
-shouldBeTrue("document1.body != document.body");
</del><ins>+shouldNotBe("document2.body", "null");
+shouldBeNull("document1.body");
</ins><span class="cx">
</span><del>-body1 = document1.createElement('body');
-document1.body = body1;
-shouldBe("document1.body", "body1")
</del><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (202892 => 202893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-07 03:38:48 UTC (rev 202892)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-07 04:14:28 UTC (rev 202893)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-07-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Align Document.body setter with the HTML specification
+ https://bugs.webkit.org/show_bug.cgi?id=159490
+
+ Reviewed by Alex Christensen.
+
+ Rebaseline existing W3C test now that one more check is passing.
+
+ * web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body-expected.txt:
+
+2016-07-06 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Document.body should return the first child of the html element that is either a body / frameset element
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159488
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmldomdocumentsdomtreeaccessorsDocumentbodyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body-expected.txt (202892 => 202893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body-expected.txt 2016-07-07 03:38:48 UTC (rev 202892)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body-expected.txt 2016-07-07 04:14:28 UTC (rev 202893)
</span><span class="lines">@@ -20,5 +20,5 @@
</span><span class="cx"> PASS Setting document.body to a div element.
</span><span class="cx"> PASS Setting document.body when there's no root element.
</span><span class="cx"> PASS Setting document.body to a new body element.
</span><del>-FAIL Setting document.body to a new frameset element. HierarchyRequestError: DOM Exception 3
</del><ins>+PASS Setting document.body to a new frameset element.
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202892 => 202893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-07 03:38:48 UTC (rev 202892)
+++ trunk/Source/WebCore/ChangeLog 2016-07-07 04:14:28 UTC (rev 202893)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-07-06 Chris Dumez <cdumez@apple.com>
+
+ Align Document.body setter with the HTML specification
+ https://bugs.webkit.org/show_bug.cgi?id=159490
+
+ Reviewed by Alex Christensen.
+
+ Align Document.body setter with the HTML specification:
+ - https://html.spec.whatwg.org/multipage/dom.html#dom-document-body
+
+ In particular, the following web-exposed changes were made:
+ - It is now possible to set document.body to a frameset element.
+ - We no longer call importNode() on the passed in body. Therefore,
+ if the body comes from another document, its will be adopted /
+ transferred rather than cloned.
+
+ Both changes match the behavior of Firefox and Chrome.
+
+ No new tests, updated / rebaselined existing tests.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setBodyOrFrameset):
+
</ins><span class="cx"> 2016-07-06 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix my bogus json I landed earlier today.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (202892 => 202893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-07-07 03:38:48 UTC (rev 202892)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-07-07 04:14:28 UTC (rev 202893)
</span><span class="lines">@@ -2624,27 +2624,26 @@
</span><span class="cx">
</span><span class="cx"> void Document::setBodyOrFrameset(RefPtr<HTMLElement>&& newBody, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- // FIXME: This does not support setting a <frameset> Element, only a <body>. This does
- // not match the HTML specification:
- // https://html.spec.whatwg.org/multipage/dom.html#dom-document-body
- if (!newBody || !documentElement() || !newBody->hasTagName(bodyTag)) {
</del><ins>+ if (!is<HTMLBodyElement>(newBody.get()) && !is<HTMLFrameSetElement>(newBody.get())) {
</ins><span class="cx"> ec = HIERARCHY_REQUEST_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (&newBody->document() != this) {
- ec = 0;
- RefPtr<Node> node = importNode(*newBody, true, ec);
- if (ec)
- return;
-
- newBody = downcast<HTMLElement>(node.get());
</del><ins>+ auto* currentBody = bodyOrFrameset();
+ if (newBody == currentBody)
+ return;
+
+ if (currentBody) {
+ documentElement()->replaceChild(*newBody, *currentBody, ec);
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (auto* body = bodyOrFrameset())
- documentElement()->replaceChild(*newBody, *body, ec);
- else
- documentElement()->appendChild(*newBody, ec);
</del><ins>+ if (!documentElement()) {
+ ec = HIERARCHY_REQUEST_ERR;
+ return;
+ }
+
+ documentElement()->appendChild(*newBody, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Location* Document::location() const
</span></span></pre>
</div>
</div>
</body>
</html>