<!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>[207710] 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/207710">207710</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-22 01:15:52 -0700 (Sat, 22 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Upgrading custom element should enqueue attributeChanged and connected callbacks
https://bugs.webkit.org/show_bug.cgi?id=163840
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
Rebaselined the tests as more test cases are passing now.
* web-platform-tests/custom-elements/reactions/Node-expected.txt:
* web-platform-tests/custom-elements/reactions/Range-expected.txt:
Source/WebCore:
When upgrading a custom element, enqueue attributeChanged and connectedCallbacks as needed as specified
in step 3 and 4 of: https://html.spec.whatwg.org/multipage/scripting.html#concept-upgrade-an-element
Test: fast/custom-elements/upgrading-enqueue-reactions.html
* bindings/js/JSCustomElementInterface.cpp:
(WebCore::JSCustomElementInterface::upgradeElement): Enqueue
* dom/CustomElementReactionQueue.cpp:
(WebCore::CustomElementReactionQueueItem::invoke): Don't invoke callbacks when the custom element had
failed to upgrade.
(WebCore::CustomElementReactionQueue::enqueuePostUpgradeReactions): Added.
(WebCore::CustomElementReactionQueue::invokeAll): Upgrading a custom element may enqueue more reactions.
Keep invoking reactions until the queue becomes empty.
* dom/CustomElementReactionQueue.h:
* dom/Range.idl: Added a forgotten CEReactions here.
LayoutTests:
Added a W3C style testharness.js test for making sure upgrading custom custom elements
would enqueue attributedChanged and connected reactions.
* fast/custom-elements/upgrading-enqueue-reactions-expected.txt: Added.
* fast/custom-elements/upgrading-enqueue-reactions.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscustomelementsreactionsNodeexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/custom-elements/reactions/Node-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscustomelementsreactionsRangeexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/custom-elements/reactions/Range-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomElementInterfacecpp">trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCustomElementReactionQueuecpp">trunk/Source/WebCore/dom/CustomElementReactionQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCustomElementReactionQueueh">trunk/Source/WebCore/dom/CustomElementReactionQueue.h</a></li>
<li><a href="#trunkSourceWebCoredomRangeidl">trunk/Source/WebCore/dom/Range.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcustomelementsupgradingenqueuereactionsexpectedtxt">trunk/LayoutTests/fast/custom-elements/upgrading-enqueue-reactions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcustomelementsupgradingenqueuereactionshtml">trunk/LayoutTests/fast/custom-elements/upgrading-enqueue-reactions.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207709 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-22 07:23:28 UTC (rev 207709)
+++ trunk/LayoutTests/ChangeLog 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-22 Ryosuke Niwa <rniwa@webkit.org>
+
+ Upgrading custom element should enqueue attributeChanged and connected callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=163840
+
+ Reviewed by Darin Adler.
+
+ Added a W3C style testharness.js test for making sure upgrading custom custom elements
+ would enqueue attributedChanged and connected reactions.
+
+ * fast/custom-elements/upgrading-enqueue-reactions-expected.txt: Added.
+ * fast/custom-elements/upgrading-enqueue-reactions.html: Added.
+
</ins><span class="cx"> 2016-10-21 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update custom elements tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastcustomelementsupgradingenqueuereactionsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/custom-elements/upgrading-enqueue-reactions-expected.txt (0 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/custom-elements/upgrading-enqueue-reactions-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/custom-elements/upgrading-enqueue-reactions-expected.txt 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+CONSOLE MESSAGE: line 157: Exception thrown as a part of test
+
+PASS Upgrading a custom element must enqueue attributeChangedCallback on each attribute
+PASS Upgrading a custom element not must enqueue attributeChangedCallback on unobserved attributes
+PASS Upgrading a custom element must enqueue connectedCallback if the element in the document
+PASS Upgrading a custom element must enqueue attributeChangedCallback before connectedCallback
+PASS Upgrading a custom element must not invoke attributeChangedCallback and connectedCallback when the element failed to upgrade
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcustomelementsupgradingenqueuereactionshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/custom-elements/upgrading-enqueue-reactions.html (0 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/custom-elements/upgrading-enqueue-reactions.html (rev 0)
+++ trunk/LayoutTests/fast/custom-elements/upgrading-enqueue-reactions.html 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -0,0 +1,176 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>Custom Elements: CEReactions on Attr interface</title>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<meta name="assert" content="value of Attr interface must have CEReactions">
+<meta name="help" content="https://dom.spec.whatwg.org/#node">
+<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>
+setup({allow_uncaught_exception:true});
+
+function create_constructor_log(element) {
+ return {type: 'constructed', element: element};
+}
+
+function assert_constructor_log_entry(log, element) {
+ assert_equals(log.type, 'constructed');
+ assert_equals(log.element, element);
+}
+
+function create_connected_callback_log(element) {
+ return {type: 'connected', element: element};
+}
+
+function assert_connected_log_entry(log, element) {
+ assert_equals(log.type, 'connected');
+ assert_equals(log.element, element);
+}
+
+test_with_window(function (contentWindow) {
+ const contentDocument = contentWindow.document;
+ contentDocument.write('<test-element id="some" title="This is a test">');
+
+ const undefinedElement = contentDocument.querySelector('test-element');
+ assert_equals(Object.getPrototypeOf(undefinedElement), contentWindow.HTMLElement.prototype);
+
+ let log = [];
+ class TestElement extends contentWindow.HTMLElement {
+ constructor() {
+ super();
+ log.push(create_constructor_log(this));
+ }
+ attributeChangedCallback(...args) {
+ log.push(create_attribute_changed_callback_log(this, ...args));
+ }
+ static get observedAttributes() { return ['id', 'title']; }
+ }
+ contentWindow.customElements.define('test-element', TestElement);
+ assert_equals(Object.getPrototypeOf(undefinedElement), TestElement.prototype);
+
+ assert_equals(log.length, 3);
+ assert_constructor_log_entry(log[0], undefinedElement);
+ assert_attribute_log_entry(log[1], {name: 'id', oldValue: null, newValue: 'some', namespace: null});
+ assert_attribute_log_entry(log[2], {name: 'title', oldValue: null, newValue: 'This is a test', namespace: null});
+}, 'Upgrading a custom element must enqueue attributeChangedCallback on each attribute');
+
+test_with_window(function (contentWindow) {
+ const contentDocument = contentWindow.document;
+ contentDocument.write('<test-element id="some" title="This is a test" class="foo">');
+
+ const undefinedElement = contentDocument.querySelector('test-element');
+ assert_equals(Object.getPrototypeOf(undefinedElement), contentWindow.HTMLElement.prototype);
+
+ let log = [];
+ class TestElement extends contentWindow.HTMLElement {
+ constructor() {
+ super();
+ log.push(create_constructor_log(this));
+ }
+ attributeChangedCallback(...args) {
+ log.push(create_attribute_changed_callback_log(this, ...args));
+ }
+ static get observedAttributes() { return ['class', 'id']; }
+ }
+ contentWindow.customElements.define('test-element', TestElement);
+ assert_equals(Object.getPrototypeOf(undefinedElement), TestElement.prototype);
+
+ assert_equals(log.length, 3);
+ assert_constructor_log_entry(log[0], undefinedElement);
+ assert_attribute_log_entry(log[1], {name: 'id', oldValue: null, newValue: 'some', namespace: null});
+ assert_attribute_log_entry(log[2], {name: 'class', oldValue: null, newValue: 'foo', namespace: null});
+}, 'Upgrading a custom element not must enqueue attributeChangedCallback on unobserved attributes');
+
+test_with_window(function (contentWindow) {
+ const contentDocument = contentWindow.document;
+ contentDocument.write('<test-element id="some" title="This is a test" class="foo">');
+
+ const undefinedElement = contentDocument.querySelector('test-element');
+ assert_equals(Object.getPrototypeOf(undefinedElement), contentWindow.HTMLElement.prototype);
+
+ let log = [];
+ class TestElement extends contentWindow.HTMLElement {
+ constructor() {
+ super();
+ log.push(create_constructor_log(this));
+ }
+ connectedCallback(...args) {
+ log.push(create_connected_callback_log(this, ...args));
+ }
+ }
+ contentWindow.customElements.define('test-element', TestElement);
+ assert_equals(Object.getPrototypeOf(undefinedElement), TestElement.prototype);
+
+ assert_equals(log.length, 2);
+ assert_constructor_log_entry(log[0], undefinedElement);
+ assert_connected_log_entry(log[1], undefinedElement);
+}, 'Upgrading a custom element must enqueue connectedCallback if the element in the document');
+
+test_with_window(function (contentWindow) {
+ const contentDocument = contentWindow.document;
+ contentDocument.write('<test-element id="some" title="This is a test" class="foo">');
+
+ const undefinedElement = contentDocument.querySelector('test-element');
+ assert_equals(Object.getPrototypeOf(undefinedElement), contentWindow.HTMLElement.prototype);
+
+ let log = [];
+ class TestElement extends contentWindow.HTMLElement {
+ constructor() {
+ super();
+ log.push(create_constructor_log(this));
+ }
+ connectedCallback(...args) {
+ log.push(create_connected_callback_log(this, ...args));
+ }
+ attributeChangedCallback(...args) {
+ log.push(create_attribute_changed_callback_log(this, ...args));
+ }
+ static get observedAttributes() { return ['class', 'id']; }
+ }
+ contentWindow.customElements.define('test-element', TestElement);
+ assert_equals(Object.getPrototypeOf(undefinedElement), TestElement.prototype);
+
+ assert_equals(log.length, 4);
+ assert_constructor_log_entry(log[0], undefinedElement);
+ assert_attribute_log_entry(log[1], {name: 'id', oldValue: null, newValue: 'some', namespace: null});
+ assert_attribute_log_entry(log[2], {name: 'class', oldValue: null, newValue: 'foo', namespace: null});
+ assert_connected_log_entry(log[3], undefinedElement);
+}, 'Upgrading a custom element must enqueue attributeChangedCallback before connectedCallback');
+
+test_with_window(function (contentWindow) {
+ const contentDocument = contentWindow.document;
+ contentDocument.write('<test-element id="some" title="This is a test" class="foo">');
+
+ const undefinedElement = contentDocument.querySelector('test-element');
+ assert_equals(Object.getPrototypeOf(undefinedElement), contentWindow.HTMLElement.prototype);
+
+ let log = [];
+ class TestElement extends contentWindow.HTMLElement {
+ constructor() {
+ super();
+ log.push(create_constructor_log(this));
+ throw 'Exception thrown as a part of test';
+ }
+ connectedCallback(...args) {
+ log.push(create_connected_callback_log(this, ...args));
+ }
+ attributeChangedCallback(...args) {
+ log.push(create_attribute_changed_callback_log(this, ...args));
+ }
+ static get observedAttributes() { return ['class', 'id']; }
+ }
+ contentWindow.customElements.define('test-element', TestElement);
+ assert_equals(Object.getPrototypeOf(undefinedElement), TestElement.prototype);
+
+ assert_equals(log.length, 1);
+ assert_constructor_log_entry(log[0], undefinedElement);
+}, 'Upgrading a custom element must not invoke attributeChangedCallback and connectedCallback when the element failed to upgrade');
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (207709 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-10-22 07:23:28 UTC (rev 207709)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-22 Ryosuke Niwa <rniwa@webkit.org>
+
+ Upgrading custom element should enqueue attributeChanged and connected callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=163840
+
+ Reviewed by Darin Adler.
+
+ Rebaselined the tests as more test cases are passing now.
+
+ * web-platform-tests/custom-elements/reactions/Node-expected.txt:
+ * web-platform-tests/custom-elements/reactions/Range-expected.txt:
+
</ins><span class="cx"> 2016-10-21 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update custom elements tests
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscustomelementsreactionsNodeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/custom-elements/reactions/Node-expected.txt (207709 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/custom-elements/reactions/Node-expected.txt 2016-10-22 07:23:28 UTC (rev 207709)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/custom-elements/reactions/Node-expected.txt 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> PASS nodeValue on Node must not enqueue an attributeChanged reaction when replacing an existing unobserved attribute
</span><span class="cx"> FAIL textContent on Node must enqueue an attributeChanged reaction when replacing an existing attribute assert_array_equals: lengths differ, expected 1 got 2
</span><span class="cx"> PASS textContent on Node must not enqueue an attributeChanged reaction when replacing an existing unobserved attribute
</span><del>-FAIL cloneNode on Node must enqueue an attributeChanged reaction when cloning an element with an observed attribute assert_array_equals: lengths differ, expected 2 got 1
</del><ins>+PASS cloneNode on Node must enqueue an attributeChanged reaction when cloning an element with an observed attribute
</ins><span class="cx"> PASS cloneNode on Node must not enqueue an attributeChanged reaction when cloning an element with an unobserved attribute
</span><del>-FAIL cloneNode on Node must enqueue an attributeChanged reaction when cloning an element only for observed attributes assert_array_equals: lengths differ, expected 3 got 1
</del><ins>+PASS cloneNode on Node must enqueue an attributeChanged reaction when cloning an element only for observed attributes
</ins><span class="cx"> PASS insertBefore on ChildNode must enqueue a connected reaction
</span><span class="cx"> PASS insertBefore on ChildNode must enqueue a disconnected reaction, an adopted reaction, and a connected reaction when the custom element was in another document
</span><span class="cx"> PASS appendChild on ChildNode must enqueue a connected reaction
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscustomelementsreactionsRangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/custom-elements/reactions/Range-expected.txt (207709 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/custom-elements/reactions/Range-expected.txt 2016-10-22 07:23:28 UTC (rev 207709)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/custom-elements/reactions/Range-expected.txt 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx">
</span><span class="cx"> PASS deleteContents on Range must enqueue a disconnected reaction
</span><span class="cx"> PASS extractContents on Range must enqueue a disconnected reaction
</span><del>-FAIL cloneContents on Range must enqueue an attributeChanged reaction when cloning an element with an observed attribute assert_array_equals: lengths differ, expected 2 got 1
</del><ins>+PASS cloneContents on Range must enqueue an attributeChanged reaction when cloning an element with an observed attribute
</ins><span class="cx"> PASS cloneContents on Range must not enqueue an attributeChanged reaction when cloning an element with an unobserved attribute
</span><del>-FAIL cloneContents on Range must enqueue an attributeChanged reaction when cloning an element only for observed attributes assert_array_equals: lengths differ, expected 3 got 1
</del><ins>+PASS cloneContents on Range must enqueue an attributeChanged reaction when cloning an element only for observed attributes
</ins><span class="cx"> PASS insertNode on Range must enqueue a connected reaction
</span><span class="cx"> PASS insertNode on Range must enqueue a disconnected reaction, an adopted reaction, and a connected reaction when the custom element was in another document
</span><span class="cx"> PASS surroundContents on Range must enqueue a connected reaction
</span><span class="cx"> PASS surroundContents on Range must enqueue a disconnected reaction, an adopted reaction, and a connected reaction when the custom element was in another document
</span><del>-FAIL createContextualFragment on Range must construct a custom element assert_array_equals: lengths differ, expected 2 got 1
</del><ins>+PASS createContextualFragment on Range must construct a custom element
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207709 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-22 07:23:28 UTC (rev 207709)
+++ trunk/Source/WebCore/ChangeLog 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-10-22 Ryosuke Niwa <rniwa@webkit.org>
+
+ Upgrading custom element should enqueue attributeChanged and connected callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=163840
+
+ Reviewed by Darin Adler.
+
+ When upgrading a custom element, enqueue attributeChanged and connectedCallbacks as needed as specified
+ in step 3 and 4 of: https://html.spec.whatwg.org/multipage/scripting.html#concept-upgrade-an-element
+
+ Test: fast/custom-elements/upgrading-enqueue-reactions.html
+
+ * bindings/js/JSCustomElementInterface.cpp:
+ (WebCore::JSCustomElementInterface::upgradeElement): Enqueue
+ * dom/CustomElementReactionQueue.cpp:
+ (WebCore::CustomElementReactionQueueItem::invoke): Don't invoke callbacks when the custom element had
+ failed to upgrade.
+ (WebCore::CustomElementReactionQueue::enqueuePostUpgradeReactions): Added.
+ (WebCore::CustomElementReactionQueue::invokeAll): Upgrading a custom element may enqueue more reactions.
+ Keep invoking reactions until the queue becomes empty.
+ * dom/CustomElementReactionQueue.h:
+ * dom/Range.idl: Added a forgotten CEReactions here.
+
</ins><span class="cx"> 2016-10-21 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Bug 163762: IntSize::area() should used checked arithmetic
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomElementInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp (207709 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp 2016-10-22 07:23:28 UTC (rev 207709)
+++ trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -182,6 +182,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ CustomElementReactionQueue::enqueuePostUpgradeReactions(element, *this);
+
</ins><span class="cx"> m_constructionStack.append(&element);
</span><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer args;
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomElementReactionQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomElementReactionQueue.cpp (207709 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomElementReactionQueue.cpp 2016-10-22 07:23:28 UTC (rev 207709)
+++ trunk/Source/WebCore/dom/CustomElementReactionQueue.cpp 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -75,6 +75,8 @@
</span><span class="cx">
</span><span class="cx"> void invoke()
</span><span class="cx"> {
</span><ins>+ if (m_element->isFailedCustomElement())
+ return;
</ins><span class="cx"> switch (m_type) {
</span><span class="cx"> case Type::ElementUpgrade:
</span><span class="cx"> m_interface->upgradeElement(m_element.get());
</span><span class="lines">@@ -188,12 +190,34 @@
</span><span class="cx"> queue->m_items.append({element, *elementInterface, attributeName, oldValue, newValue});
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CustomElementReactionQueue::enqueuePostUpgradeReactions(Element& element, JSCustomElementInterface& elementInterface)
+{
+ if (!element.hasAttributes() && !element.inDocument())
+ return;
+
+ auto* queue = CustomElementReactionStack::ensureCurrentQueue();
+ if (!queue)
+ return;
+
+ if (element.hasAttributes()) {
+ for (auto& attribute : element.attributesIterator()) {
+ if (elementInterface.observesAttribute(attribute.localName()))
+ queue->m_items.append({element, elementInterface, attribute.name(), nullAtom, attribute.value()});
+ }
+ }
+
+ if (element.inDocument() && elementInterface.hasConnectedCallback())
+ queue->m_items.append({CustomElementReactionQueueItem::Type::Connected, element, elementInterface});
+}
+
</ins><span class="cx"> void CustomElementReactionQueue::invokeAll()
</span><span class="cx"> {
</span><del>- Vector<CustomElementReactionQueueItem> items;
- items.swap(m_items);
- for (auto& item : items)
- item.invoke();
</del><ins>+ // FIXME: This queue needs to be per element.
+ while (!m_items.isEmpty()) {
+ Vector<CustomElementReactionQueueItem> items = WTFMove(m_items);
+ for (auto& item : items)
+ item.invoke();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CustomElementReactionQueue* CustomElementReactionStack::ensureCurrentQueue()
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomElementReactionQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomElementReactionQueue.h (207709 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomElementReactionQueue.h 2016-10-22 07:23:28 UTC (rev 207709)
+++ trunk/Source/WebCore/dom/CustomElementReactionQueue.h 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> static void enqueueDisconnectedCallbackIfNeeded(Element&);
</span><span class="cx"> static void enqueueAdoptedCallbackIfNeeded(Element&, Document& oldDocument, Document& newDocument);
</span><span class="cx"> static void enqueueAttributeChangedCallbackIfNeeded(Element&, const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue);
</span><ins>+ static void enqueuePostUpgradeReactions(Element&, JSCustomElementInterface&);
</ins><span class="cx">
</span><span class="cx"> void invokeAll();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.idl (207709 => 207710)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.idl 2016-10-22 07:23:28 UTC (rev 207709)
+++ trunk/Source/WebCore/dom/Range.idl 2016-10-22 08:15:52 UTC (rev 207710)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> ClientRectList getClientRects();
</span><span class="cx"> ClientRect getBoundingClientRect();
</span><span class="cx">
</span><del>- [MayThrowLegacyException, NewObject] DocumentFragment createContextualFragment(DOMString html);
</del><ins>+ [CEReactions, MayThrowLegacyException, NewObject] DocumentFragment createContextualFragment(DOMString html);
</ins><span class="cx">
</span><span class="cx"> [MayThrowLegacyException] short compareNode(Node refNode);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>