<!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>[206308] 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/206308">206308</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-23 09:24:35 -0700 (Fri, 23 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Align Element.insertAdjacentHTML() with the specification
https://bugs.webkit.org/show_bug.cgi?id=162479
Reviewed by Sam Weinig.
LayoutTests/imported/w3c:
Rebaseline W3C test now that one more check is passing.
* web-platform-tests/domparsing/insert_adjacent_html-expected.txt:
Source/WebCore:
Align Element.insertAdjacentHTML() with the specification:
- https://w3c.github.io/DOM-Parsing/#dom-element-insertadjacenthtml (steps 1 & 2)
In particular, the following changes issues are now fixed:
- Calling insertAdjacentHTML() on an element whose parent is a
DocumentFragment now works insteas of throwing a
NO_MODIFICATION_ALLOWED_ERR.
- Calling insertAdjacentHTML() on child of the <html> element
no longer creates duplicate body / head elements.
Firefox agrees with the specification.
Test: fast/dom/insertAdjacentHTML-DocumentFragment-parent.html
* dom/Element.cpp:
(WebCore::contextNodeForInsertion):
(WebCore::Element::insertAdjacentHTML):
LayoutTests:
Add layout test coverage for calling insertAdjacentHTML on an element
whose parent is a DocumentFragment. I have verified that this test is
passing in Firefox.
* fast/dom/insertAdjacentHTML-DocumentFragment-crash-expected.txt:
* fast/dom/insertAdjacentHTML-DocumentFragment-parent-expected.txt: Added.
* fast/dom/insertAdjacentHTML-DocumentFragment-parent.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdominsertAdjacentHTMLDocumentFragmentcrashexpectedtxt">trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdomparsinginsert_adjacent_htmlexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/domparsing/insert_adjacent_html-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdominsertAdjacentHTMLDocumentFragmentparentexpectedtxt">trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-parent-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdominsertAdjacentHTMLDocumentFragmentparenthtml">trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-parent.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206307 => 206308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-23 16:21:19 UTC (rev 206307)
+++ trunk/LayoutTests/ChangeLog 2016-09-23 16:24:35 UTC (rev 206308)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-23 Chris Dumez <cdumez@apple.com>
+
+ Align Element.insertAdjacentHTML() with the specification
+ https://bugs.webkit.org/show_bug.cgi?id=162479
+
+ Reviewed by Sam Weinig.
+
+ Add layout test coverage for calling insertAdjacentHTML on an element
+ whose parent is a DocumentFragment. I have verified that this test is
+ passing in Firefox.
+
+ * fast/dom/insertAdjacentHTML-DocumentFragment-crash-expected.txt:
+ * fast/dom/insertAdjacentHTML-DocumentFragment-parent-expected.txt: Added.
+ * fast/dom/insertAdjacentHTML-DocumentFragment-parent.html: Added.
+
</ins><span class="cx"> 2016-09-23 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r206165.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdominsertAdjacentHTMLDocumentFragmentcrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-crash-expected.txt (206307 => 206308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-crash-expected.txt 2016-09-23 16:21:19 UTC (rev 206307)
+++ trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-crash-expected.txt 2016-09-23 16:24:35 UTC (rev 206308)
</span><span class="lines">@@ -1,2 +1 @@
</span><del>-CONSOLE MESSAGE: line 9: NoModificationAllowedError (DOM Exception 7): The object can not be modified.
</del><span class="cx"> This test passes if it doesn't crash (or ASSERT).
</span></span></pre></div>
<a id="trunkLayoutTestsfastdominsertAdjacentHTMLDocumentFragmentparentexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-parent-expected.txt (0 => 206308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-parent-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-parent-expected.txt 2016-09-23 16:24:35 UTC (rev 206308)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Tests that insertAdjacentHTML() works if the element's parent is a DocumentFragment.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS div.insertAdjacentHTML('beforebegin', '<a>test</a>') did not throw exception.
+PASS fragment.firstChild.tagName is "A"
+PASS fragment.firstChild.nextSibling.tagName is "DIV"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdominsertAdjacentHTMLDocumentFragmentparenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-parent.html (0 => 206308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-parent.html (rev 0)
+++ trunk/LayoutTests/fast/dom/insertAdjacentHTML-DocumentFragment-parent.html 2016-09-23 16:24:35 UTC (rev 206308)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+description("Tests that insertAdjacentHTML() works if the element's parent is a DocumentFragment.");
+
+var fragment = new DocumentFragment();
+var div = document.createElement("div");
+fragment.appendChild(div);
+
+shouldNotThrow("div.insertAdjacentHTML('beforebegin', '<a>test</a>')");
+shouldBeEqualToString("fragment.firstChild.tagName", "A");
+shouldBeEqualToString("fragment.firstChild.nextSibling.tagName", "DIV");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (206307 => 206308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-23 16:21:19 UTC (rev 206307)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-23 16:24:35 UTC (rev 206308)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-23 Chris Dumez <cdumez@apple.com>
+
+ Align Element.insertAdjacentHTML() with the specification
+ https://bugs.webkit.org/show_bug.cgi?id=162479
+
+ Reviewed by Sam Weinig.
+
+ Rebaseline W3C test now that one more check is passing.
+
+ * web-platform-tests/domparsing/insert_adjacent_html-expected.txt:
+
</ins><span class="cx"> 2016-09-23 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r206165.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdomparsinginsert_adjacent_htmlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/domparsing/insert_adjacent_html-expected.txt (206307 => 206308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/domparsing/insert_adjacent_html-expected.txt 2016-09-23 16:21:19 UTC (rev 206307)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/domparsing/insert_adjacent_html-expected.txt 2016-09-23 16:24:35 UTC (rev 206308)
</span><span class="lines">@@ -28,5 +28,5 @@
</span><span class="cx"> PASS Afterbegin content2 test again, now that there's a next sibling
</span><span class="cx"> PASS BeforeEnd content2 test again, now that there's a next sibling
</span><span class="cx"> PASS afterend content2 test again, now that there's a next sibling
</span><del>-FAIL Inserting kids of the <html> element should not do weird things with implied <body>/<head> tags assert_equals: Should still have one head expected 1 but got 3
</del><ins>+PASS Inserting kids of the <html> element should not do weird things with implied <body>/<head> tags
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206307 => 206308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-23 16:21:19 UTC (rev 206307)
+++ trunk/Source/WebCore/ChangeLog 2016-09-23 16:24:35 UTC (rev 206308)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-09-23 Chris Dumez <cdumez@apple.com>
+
+ Align Element.insertAdjacentHTML() with the specification
+ https://bugs.webkit.org/show_bug.cgi?id=162479
+
+ Reviewed by Sam Weinig.
+
+ Align Element.insertAdjacentHTML() with the specification:
+ - https://w3c.github.io/DOM-Parsing/#dom-element-insertadjacenthtml (steps 1 & 2)
+
+ In particular, the following changes issues are now fixed:
+ - Calling insertAdjacentHTML() on an element whose parent is a
+ DocumentFragment now works insteas of throwing a
+ NO_MODIFICATION_ALLOWED_ERR.
+ - Calling insertAdjacentHTML() on child of the <html> element
+ no longer creates duplicate body / head elements.
+
+ Firefox agrees with the specification.
+
+ Test: fast/dom/insertAdjacentHTML-DocumentFragment-parent.html
+
+ * dom/Element.cpp:
+ (WebCore::contextNodeForInsertion):
+ (WebCore::Element::insertAdjacentHTML):
+
</ins><span class="cx"> 2016-09-23 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r206165.
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (206307 => 206308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-09-23 16:21:19 UTC (rev 206307)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-09-23 16:24:35 UTC (rev 206308)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> #include "FocusEvent.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><span class="cx"> #include "FrameView.h"
</span><ins>+#include "HTMLBodyElement.h"
</ins><span class="cx"> #include "HTMLCanvasElement.h"
</span><span class="cx"> #include "HTMLCollection.h"
</span><span class="cx"> #include "HTMLDocument.h"
</span><span class="lines">@@ -3669,11 +3670,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Step 1 of https://w3c.github.io/DOM-Parsing/#dom-element-insertadjacenthtml.
</span><del>-static Element* contextElementForInsertion(const String& where, Element* element, ExceptionCode& ec)
</del><ins>+static ContainerNode* contextNodeForInsertion(const String& where, Element* element, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (equalLettersIgnoringASCIICase(where, "beforebegin") || equalLettersIgnoringASCIICase(where, "afterend")) {
</span><del>- auto* parent = element->parentElement();
- if (!parent) {
</del><ins>+ auto* parent = element->parentNode();
+ if (!parent || is<Document>(*parent)) {
</ins><span class="cx"> ec = NO_MODIFICATION_ALLOWED_ERR;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -3685,14 +3686,25 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// https://w3c.github.io/DOM-Parsing/#dom-element-insertadjacenthtml
</ins><span class="cx"> void Element::insertAdjacentHTML(const String& where, const String& markup, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- Element* contextElement = contextElementForInsertion(where, this, ec);
- if (!contextElement)
</del><ins>+ // Step 1.
+ auto* contextNode = contextNodeForInsertion(where, this, ec);
+ if (!contextNode)
</ins><span class="cx"> return;
</span><ins>+ RefPtr<Element> contextElement;
+ // Step 2.
+ if (!is<Element>(*contextNode)
+ || (contextNode->document().isHTMLDocument() && is<HTMLHtmlElement>(*contextNode))) {
+ contextElement = HTMLBodyElement::create(contextNode->document());
+ } else
+ contextElement = downcast<Element>(contextNode);
+ // Step 3.
</ins><span class="cx"> RefPtr<DocumentFragment> fragment = createFragmentForInnerOuterHTML(*contextElement, markup, AllowScriptingContent, ec);
</span><span class="cx"> if (!fragment)
</span><span class="cx"> return;
</span><ins>+ // Step 4.
</ins><span class="cx"> insertAdjacent(where, fragment.releaseNonNull(), ec);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>