<!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>[205383] 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/205383">205383</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-02 16:25:00 -0700 (Fri, 02 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Temporarily break customElements.whenDefined to remove flaky crashes
https://bugs.webkit.org/show_bug.cgi?id=161555
Reviewed by Chris Dumez.
Source/WebCore:
Remove HashMap of DeferredWrapper which causes a crash during destruction.
This breaks the semantics of "whenDefined" for now.
* bindings/js/JSCustomElementRegistryCustom.cpp:
(WebCore::whenDefinedPromise):
* dom/CustomElementRegistry.cpp:
(WebCore::CustomElementRegistry::addElementDefinition):
* dom/CustomElementRegistry.h:
(WebCore::CustomElementRegistry::promiseMap): Deleted.
LayoutTests:
Rebaseline the test now that some test cases are failing due to the partial rollout.
* fast/custom-elements/CustomElementRegistry-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcustomelementsCustomElementRegistryexpectedtxt">trunk/LayoutTests/fast/custom-elements/CustomElementRegistry-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomElementRegistryCustomcpp">trunk/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCustomElementRegistrycpp">trunk/Source/WebCore/dom/CustomElementRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCustomElementRegistryh">trunk/Source/WebCore/dom/CustomElementRegistry.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205382 => 205383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-02 23:18:48 UTC (rev 205382)
+++ trunk/LayoutTests/ChangeLog 2016-09-02 23:25:00 UTC (rev 205383)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-02 Ryosuke Niwa <rniwa@webkit.org>
+
+ Temporarily break customElements.whenDefined to remove flaky crashes
+ https://bugs.webkit.org/show_bug.cgi?id=161555
+
+ Reviewed by Chris Dumez.
+
+ Rebaseline the test now that some test cases are failing due to the partial rollout.
+
+ * fast/custom-elements/CustomElementRegistry-expected.txt:
+
</ins><span class="cx"> 2016-09-02 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r205373.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcustomelementsCustomElementRegistryexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/custom-elements/CustomElementRegistry-expected.txt (205382 => 205383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/custom-elements/CustomElementRegistry-expected.txt 2016-09-02 23:18:48 UTC (rev 205382)
+++ trunk/LayoutTests/fast/custom-elements/CustomElementRegistry-expected.txt 2016-09-02 23:25:00 UTC (rev 205383)
</span><span class="lines">@@ -29,11 +29,11 @@
</span><span class="cx"> PASS customElements.get must return undefined when the registry does not contain an entry with the given name
</span><span class="cx"> PASS customElements.get must return undefined when the registry does not contain an entry with the given name even if the name was not a valid custom element name
</span><span class="cx"> PASS customElements.get return the constructor of the entry with the given name when there is a matching entry.
</span><del>-PASS customElements.whenDefined must return a promise for a valid custom element name
</del><ins>+FAIL customElements.whenDefined must return a promise for a valid custom element name assert_true: expected true got false
</ins><span class="cx"> PASS customElements.whenDefined must return the same promise each time invoked for a valid custom element name which has not been defined
</span><del>-PASS customElements.whenDefined must return an unresolved promise when the registry does not contain the entry with the given name
</del><ins>+FAIL customElements.whenDefined must return an unresolved promise when the registry does not contain the entry with the given name undefined is not an object (evaluating 'customElements.whenDefined('a-b').then')
</ins><span class="cx"> PASS customElements.whenDefined must return a rejected promise when the given name is not a valid custom element name
</span><span class="cx"> PASS customElements.whenDefined must return a resolved promise when the registry contains the entry with the given name
</span><span class="cx"> PASS customElements.whenDefined must return a new resolved promise each time invoked when the registry contains the entry with the given name
</span><del>-PASS A promise returned by customElements.whenDefined must be resolved by "define"
</del><ins>+FAIL A promise returned by customElements.whenDefined must be resolved by "define" undefined is not an object (evaluating 'promise.then')
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205382 => 205383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-02 23:18:48 UTC (rev 205382)
+++ trunk/Source/WebCore/ChangeLog 2016-09-02 23:25:00 UTC (rev 205383)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-09-02 Ryosuke Niwa <rniwa@webkit.org>
+
+ Temporarily break customElements.whenDefined to remove flaky crashes
+ https://bugs.webkit.org/show_bug.cgi?id=161555
+
+ Reviewed by Chris Dumez.
+
+ Remove HashMap of DeferredWrapper which causes a crash during destruction.
+ This breaks the semantics of "whenDefined" for now.
+
+ * bindings/js/JSCustomElementRegistryCustom.cpp:
+ (WebCore::whenDefinedPromise):
+ * dom/CustomElementRegistry.cpp:
+ (WebCore::CustomElementRegistry::addElementDefinition):
+ * dom/CustomElementRegistry.h:
+ (WebCore::CustomElementRegistry::promiseMap): Deleted.
+
</ins><span class="cx"> 2016-09-02 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx"> Unreviewed, rolling out r205373.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomElementRegistryCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp (205382 => 205383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp 2016-09-02 23:18:48 UTC (rev 205382)
+++ trunk/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp 2016-09-02 23:25:00 UTC (rev 205383)
</span><span class="lines">@@ -182,11 +182,7 @@
</span><span class="cx"> return jsPromise.promise();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto result = registry.promiseMap().ensure(localName, [&] {
- return DeferredWrapper::create(&state, &globalObject, JSPromiseDeferred::create(&state, &globalObject));
- });
-
- return result.iterator->value->promise();
</del><ins>+ return jsUndefined();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSCustomElementRegistry::whenDefined(ExecState& state)
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomElementRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomElementRegistry.cpp (205382 => 205383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomElementRegistry.cpp 2016-09-02 23:18:48 UTC (rev 205382)
+++ trunk/Source/WebCore/dom/CustomElementRegistry.cpp 2016-09-02 23:25:00 UTC (rev 205383)
</span><span class="lines">@@ -78,9 +78,6 @@
</span><span class="cx">
</span><span class="cx"> if (auto* document = m_window.document())
</span><span class="cx"> enqueueUpgradeInShadowIncludingTreeOrder(*document, elementInterface.get());
</span><del>-
- if (auto promise = m_promiseMap.take(localName))
- promise.value()->resolve(nullptr);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSCustomElementInterface* CustomElementRegistry::findInterface(const Element& element) const
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomElementRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomElementRegistry.h (205382 => 205383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomElementRegistry.h 2016-09-02 23:18:48 UTC (rev 205382)
+++ trunk/Source/WebCore/dom/CustomElementRegistry.h 2016-09-02 23:25:00 UTC (rev 205383)
</span><span class="lines">@@ -66,8 +66,6 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSValue get(const AtomicString&);
</span><span class="cx">
</span><del>- HashMap<AtomicString, Ref<DeferredWrapper>>& promiseMap() { return m_promiseMap; }
-
</del><span class="cx"> private:
</span><span class="cx"> CustomElementRegistry(DOMWindow&);
</span><span class="cx">
</span><span class="lines">@@ -74,7 +72,6 @@
</span><span class="cx"> DOMWindow& m_window;
</span><span class="cx"> HashMap<AtomicString, Ref<JSCustomElementInterface>> m_nameMap;
</span><span class="cx"> HashMap<const JSC::JSObject*, JSCustomElementInterface*> m_constructorMap;
</span><del>- HashMap<AtomicString, Ref<DeferredWrapper>> m_promiseMap;
</del><span class="cx">
</span><span class="cx"> bool m_elementDefinitionIsRunning { false };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>