<!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>[209610] 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/209610">209610</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-09 09:54:56 -0800 (Fri, 09 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Custom Elements from a different document are not customized when created with innerHTML
https://bugs.webkit.org/show_bug.cgi?id=165617
Reviewed by Antti Koivisto.
Source/WebCore:
The bug was caused by a superflous null check on window in createHTMLElementOrFindCustomElementInterface.
Removed the nullcheck to fix the bug.
Test: fast/custom-elements/adopting-from-frameless-document.html
* html/parser/HTMLConstructionSite.cpp:
(WebCore::HTMLConstructionSite::createHTMLElementOrFindCustomElementInterface):
LayoutTests:
Added a W3C style testharness.js test.
* fast/custom-elements/adopting-from-frameless-document-expected.txt: Added.
* fast/custom-elements/adopting-from-frameless-document.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLConstructionSitecpp">trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcustomelementsadoptingfromframelessdocumentexpectedtxt">trunk/LayoutTests/fast/custom-elements/adopting-from-frameless-document-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcustomelementsadoptingfromframelessdocumenthtml">trunk/LayoutTests/fast/custom-elements/adopting-from-frameless-document.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209609 => 209610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-09 17:45:29 UTC (rev 209609)
+++ trunk/LayoutTests/ChangeLog 2016-12-09 17:54:56 UTC (rev 209610)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-09 Ryosuke Niwa <rniwa@webkit.org>
+
+ Custom Elements from a different document are not customized when created with innerHTML
+ https://bugs.webkit.org/show_bug.cgi?id=165617
+
+ Reviewed by Antti Koivisto.
+
+ Added a W3C style testharness.js test.
+
+ * fast/custom-elements/adopting-from-frameless-document-expected.txt: Added.
+ * fast/custom-elements/adopting-from-frameless-document.html: Added.
+
</ins><span class="cx"> 2016-12-09 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSP] Policy of window opener not applied to about:blank window
</span></span></pre></div>
<a id="trunkLayoutTestsfastcustomelementsadoptingfromframelessdocumentexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/custom-elements/adopting-from-frameless-document-expected.txt (0 => 209610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/custom-elements/adopting-from-frameless-document-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/custom-elements/adopting-from-frameless-document-expected.txt 2016-12-09 17:54:56 UTC (rev 209610)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+
+PASS A custom element candidate created by document.createElementNS in the document of the template elements should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by innerHTML in the document of the template elements should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.write in the document of the template elements should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.createElementNS in a new document should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by innerHTML in a new document should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.write in a new document should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.createElementNS in a cloned document should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by innerHTML in a cloned document should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.write in a cloned document should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.createElementNS in a document created by createHTMLDocument should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by innerHTML in a document created by createHTMLDocument should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.write in a document created by createHTMLDocument should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.createElementNS in an HTML document created by createDocument should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by innerHTML in an HTML document created by createDocument should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.write in an HTML document created by createDocument should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.createElementNS in an HTML document fetched by XHR should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by innerHTML in an HTML document fetched by XHR should be upgraded once adopted into a document with a definition
+PASS A custom element candidate created by document.write in an HTML document fetched by XHR should be upgraded once adopted into a document with a definition
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcustomelementsadoptingfromframelessdocumenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/custom-elements/adopting-from-frameless-document.html (0 => 209610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/custom-elements/adopting-from-frameless-document.html (rev 0)
+++ trunk/LayoutTests/fast/custom-elements/adopting-from-frameless-document.html 2016-12-09 17:54:56 UTC (rev 209610)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>Custom Elements: A custom element candidate created in a frameless document should be upgraded once adopted into a document with a definition</title>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content="A custom element candidate created in a frameless document should be upgraded once adopted into a document with a definition">
+<meta name="help" content="https://html.spec.whatwg.org/multipage/syntax.html#create-an-element-for-the-token">
+<meta name="help" content="https://dom.spec.whatwg.org/#concept-create-element">
+<meta name="help" content="https://dom.spec.whatwg.org/#concept-node-insert">
+<meta name="help" content="https://html.spec.whatwg.org/multipage/scripting.html#concept-try-upgrade">
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../../imported/w3c/web-platform-tests/custom-elements/resources/custom-elements-helpers.js"></script>
+</head>
+<body>
+<div id="log"></div>
+<script>
+
+let customElement = define_custom_element_in_window(window, 'test-element', []);
+
+document_types().forEach((entry) => {
+ if (entry.isOwner || entry.hasBrowsingContext)
+ return;
+
+ promise_test(() => {
+ return entry.create().then((doc) => {
+ assert_array_equals(customElement.takeLog().types(), []);
+ let instance = doc.createElementNS('http://www.w3.org/1999/xhtml', 'test-element');
+ doc.documentElement.appendChild(instance);
+ assert_array_equals(customElement.takeLog().types(), []);
+ document.body.appendChild(instance);
+ assert_array_equals(customElement.takeLog().types(), ['constructed', 'connected']);
+ instance.remove();
+ assert_array_equals(customElement.takeLog().types(), ['disconnected']);
+ });
+ }, `A custom element candidate created by document.createElementNS in ${entry.name} should be upgraded once adopted into a document with a definition`);
+
+ promise_test(() => {
+ return entry.create().then((doc) => {
+ assert_array_equals(customElement.takeLog().types(), []);
+ doc.documentElement.innerHTML = '<test-element xmlns="http://www.w3.org/1999/xhtml"></test-element>';
+ let instance = doc.querySelector('test-element');
+ assert_array_equals(customElement.takeLog().types(), []);
+ document.body.appendChild(instance);
+ assert_array_equals(customElement.takeLog().types(), ['constructed', 'connected']);
+ instance.remove();
+ assert_array_equals(customElement.takeLog().types(), ['disconnected']);
+ });
+ }, `A custom element candidate created by innerHTML in ${entry.name} should be upgraded once adopted into a document with a definition`);
+
+ promise_test(() => {
+ return entry.create().then((doc) => {
+ assert_array_equals(customElement.takeLog().types(), []);
+ try {
+ doc.open();
+ doc.write('<!DOCTYPE html><test-element></test-element>');
+ doc.close();
+ } catch (e) {
+ // The standards mandates that all documents have document.write but in reality, no browser implements this.
+ return;
+ }
+
+ let instance = doc.querySelector('test-element');
+ assert_array_equals(customElement.takeLog().types(), []);
+ document.body.appendChild(instance);
+ assert_array_equals(customElement.takeLog().types(), ['constructed', 'connected']);
+ instance.remove();
+ assert_array_equals(customElement.takeLog().types(), ['disconnected']);
+ });
+ }, `A custom element candidate created by document.write in ${entry.name} should be upgraded once adopted into a document with a definition`);
+
+});
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209609 => 209610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-09 17:45:29 UTC (rev 209609)
+++ trunk/Source/WebCore/ChangeLog 2016-12-09 17:54:56 UTC (rev 209610)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-12-09 Ryosuke Niwa <rniwa@webkit.org>
+
+ Custom Elements from a different document are not customized when created with innerHTML
+ https://bugs.webkit.org/show_bug.cgi?id=165617
+
+ Reviewed by Antti Koivisto.
+
+ The bug was caused by a superflous null check on window in createHTMLElementOrFindCustomElementInterface.
+ Removed the nullcheck to fix the bug.
+
+ Test: fast/custom-elements/adopting-from-frameless-document.html
+
+ * html/parser/HTMLConstructionSite.cpp:
+ (WebCore::HTMLConstructionSite::createHTMLElementOrFindCustomElementInterface):
+
</ins><span class="cx"> 2016-12-09 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSP] Policy of window opener not applied to about:blank window
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLConstructionSitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp (209609 => 209610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2016-12-09 17:45:29 UTC (rev 209609)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2016-12-09 17:54:56 UTC (rev 209610)
</span><span class="lines">@@ -666,7 +666,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> QualifiedName qualifiedName(nullAtom, localName, xhtmlNamespaceURI);
</span><del>- if (window && Document::validateCustomElementName(localName) == CustomElementNameValidationStatus::Valid) {
</del><ins>+ if (Document::validateCustomElementName(localName) == CustomElementNameValidationStatus::Valid) {
</ins><span class="cx"> element = HTMLElement::create(qualifiedName, ownerDocument);
</span><span class="cx"> element->setIsCustomElementUpgradeCandidate();
</span><span class="cx"> } else
</span></span></pre>
</div>
</div>
</body>
</html>