<!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>[204288] 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/204288">204288</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-09 11:52:11 -0700 (Tue, 09 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>It should be possible to re-initialize a CustomEvent after it's been dispatched
https://bugs.webkit.org/show_bug.cgi?id=160664
Reviewed by Darin Adler.
Source/WebCore:
It should be possible to re-initialize a CustomEvent after it's been dispatched:
- https://dom.spec.whatwg.org/#dom-customevent-initcustomevent
Test: fast/events/initCustomEvent-after-dispatch.html
* dom/CustomEvent.cpp:
(WebCore::CustomEvent::initCustomEvent):
LayoutTests:
* fast/events/initCustomEvent-after-dispatch-expected.txt: Copied from LayoutTests/fast/events/initEvent-after-dispatch-expected.txt.
* fast/events/initCustomEvent-after-dispatch.html: Copied from LayoutTests/fast/events/initEvent-after-dispatch.html.
Add layout test coverage.
* fast/events/initEvent-after-dispatch-expected.txt:
* fast/events/initEvent-after-dispatch.html:
Fix related layout test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasteventsinitEventafterdispatchexpectedtxt">trunk/LayoutTests/fast/events/initEvent-after-dispatch-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsinitEventafterdispatchhtml">trunk/LayoutTests/fast/events/initEvent-after-dispatch.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomCustomEventcpp">trunk/Source/WebCore/dom/CustomEvent.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventsinitCustomEventafterdispatchexpectedtxt">trunk/LayoutTests/fast/events/initCustomEvent-after-dispatch-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsinitCustomEventafterdispatchhtml">trunk/LayoutTests/fast/events/initCustomEvent-after-dispatch.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204287 => 204288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-09 18:06:30 UTC (rev 204287)
+++ trunk/LayoutTests/ChangeLog 2016-08-09 18:52:11 UTC (rev 204288)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-09 Chris Dumez <cdumez@apple.com>
+
+ It should be possible to re-initialize a CustomEvent after it's been dispatched
+ https://bugs.webkit.org/show_bug.cgi?id=160664
+
+ Reviewed by Darin Adler.
+
+ * fast/events/initCustomEvent-after-dispatch-expected.txt: Copied from LayoutTests/fast/events/initEvent-after-dispatch-expected.txt.
+ * fast/events/initCustomEvent-after-dispatch.html: Copied from LayoutTests/fast/events/initEvent-after-dispatch.html.
+ Add layout test coverage.
+
+ * fast/events/initEvent-after-dispatch-expected.txt:
+ * fast/events/initEvent-after-dispatch.html:
+ Fix related layout test.
+
</ins><span class="cx"> 2016-08-08 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Update test expectations for rdar://problem/27711048.
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsinitCustomEventafterdispatchexpectedtxtfromrev204287trunkLayoutTestsfasteventsinitEventafterdispatchexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/events/initCustomEvent-after-dispatch-expected.txt (from rev 204287, trunk/LayoutTests/fast/events/initEvent-after-dispatch-expected.txt) (0 => 204288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/initCustomEvent-after-dispatch-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/initCustomEvent-after-dispatch-expected.txt 2016-08-09 18:52:11 UTC (rev 204288)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+Tests calling initCustomEvent() on an custom event while it is being dispatched and after.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testEvent.__proto__ is CustomEvent.prototype
+PASS testEvent.initCustomEvent("foo", true, false, "detail") did not throw exception.
+PASS testEvent.type is "foo"
+PASS testEvent.bubbles is true
+PASS testEvent.cancelable is false
+PASS testEvent.target is null
+PASS testEvent.currentTarget is null
+PASS testEvent.eventPhase is Event.NONE
+PASS testEvent.detail is "detail"
+
+* In event handler
+PASS event.type is "foo"
+PASS event.bubbles is true
+PASS event.cancelable is false
+PASS event.target is document.body
+PASS event.currentTarget is document.body
+PASS event.eventPhase is Event.AT_TARGET
+PASS event.detail is "detail"
+
+PASS event.initCustomEvent("bar", false, true, "detail2") did not throw exception.
+PASS event.type is "foo"
+PASS event.bubbles is true
+PASS event.cancelable is false
+PASS event.target is document.body
+PASS event.currentTarget is document.body
+PASS event.eventPhase is Event.AT_TARGET
+PASS event.detail is "detail"
+PASS document.body.dispatchEvent(testEvent) did not throw exception.
+
+* After event has been dispatched
+PASS testEvent.type is "foo"
+PASS testEvent.bubbles is true
+PASS testEvent.cancelable is false
+PASS testEvent.target is document.body
+PASS testEvent.currentTarget is null
+PASS testEvent.eventPhase is Event.NONE
+PASS testEvent.detail is "detail"
+
+PASS testEvent.initCustomEvent("bar", false, true, "detail2") did not throw exception.
+PASS testEvent.type is "bar"
+PASS testEvent.bubbles is false
+PASS testEvent.cancelable is true
+PASS testEvent.target is null
+PASS testEvent.currentTarget is null
+PASS testEvent.eventPhase is Event.NONE
+PASS testEvent.detail is "detail2"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsinitCustomEventafterdispatchhtmlfromrev204287trunkLayoutTestsfasteventsinitEventafterdispatchhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/events/initCustomEvent-after-dispatch.html (from rev 204287, trunk/LayoutTests/fast/events/initEvent-after-dispatch.html) (0 => 204288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/initCustomEvent-after-dispatch.html (rev 0)
+++ trunk/LayoutTests/fast/events/initCustomEvent-after-dispatch.html 2016-08-09 18:52:11 UTC (rev 204288)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+description("Tests calling initCustomEvent() on an custom event while it is being dispatched and after.");
+
+function eventHandler(ev) {
+ event = ev;
+ debug("");
+ debug("* In event handler");
+ shouldBeEqualToString("event.type", "foo");
+ shouldBeTrue("event.bubbles");
+ shouldBeFalse("event.cancelable");
+ shouldBe("event.target", "document.body");
+ shouldBe("event.currentTarget", "document.body");
+ shouldBe("event.eventPhase", "Event.AT_TARGET");
+ shouldBeEqualToString("event.detail", "detail");
+
+ debug("");
+ // It should not be possible to re-initialize an event being dispatched.
+ shouldNotThrow('event.initCustomEvent("bar", false, true, "detail2")');
+ shouldBeEqualToString("event.type", "foo");
+ shouldBeTrue("event.bubbles");
+ shouldBeFalse("event.cancelable");
+ shouldBe("event.target", "document.body");
+ shouldBe("event.currentTarget", "document.body");
+ shouldBe("event.eventPhase", "Event.AT_TARGET");
+ shouldBeEqualToString("event.detail", "detail");
+}
+
+var testEvent = document.createEvent("customevent");
+shouldBe("testEvent.__proto__", "CustomEvent.prototype");
+shouldNotThrow('testEvent.initCustomEvent("foo", true, false, "detail")');
+shouldBeEqualToString("testEvent.type", "foo");
+shouldBeTrue("testEvent.bubbles");
+shouldBeFalse("testEvent.cancelable");
+shouldBeNull("testEvent.target");
+shouldBeNull("testEvent.currentTarget");
+shouldBe("testEvent.eventPhase", "Event.NONE");
+shouldBeEqualToString("testEvent.detail", "detail");
+
+document.body.addEventListener("foo", eventHandler);
+shouldNotThrow('document.body.dispatchEvent(testEvent)');
+
+debug("");
+debug("* After event has been dispatched");
+shouldBeEqualToString("testEvent.type", "foo");
+shouldBeTrue("testEvent.bubbles");
+shouldBeFalse("testEvent.cancelable");
+shouldBe("testEvent.target", "document.body");
+shouldBeNull("testEvent.currentTarget");
+shouldBe("testEvent.eventPhase", "Event.NONE");
+shouldBeEqualToString("testEvent.detail", "detail");
+
+// It should now be possible to re-initialize the event.
+debug("");
+shouldNotThrow('testEvent.initCustomEvent("bar", false, true, "detail2")');
+shouldBeEqualToString("testEvent.type", "bar");
+shouldBeFalse("testEvent.bubbles");
+shouldBeTrue("testEvent.cancelable");
+shouldBeNull("testEvent.target");
+shouldBeNull("testEvent.currentTarget");
+shouldBe("testEvent.eventPhase", "Event.NONE");
+shouldBeEqualToString("testEvent.detail", "detail2");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsinitEventafterdispatchexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/initEvent-after-dispatch-expected.txt (204287 => 204288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/initEvent-after-dispatch-expected.txt 2016-08-09 18:06:30 UTC (rev 204287)
+++ trunk/LayoutTests/fast/events/initEvent-after-dispatch-expected.txt 2016-08-09 18:52:11 UTC (rev 204288)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> PASS event.currentTarget is document.body
</span><span class="cx"> PASS event.eventPhase is Event.AT_TARGET
</span><span class="cx">
</span><del>-PASS testEvent.initEvent("bar", false, true) did not throw exception.
</del><ins>+PASS event.initEvent("bar", false, true) did not throw exception.
</ins><span class="cx"> PASS event.type is "foo"
</span><span class="cx"> PASS event.bubbles is true
</span><span class="cx"> PASS event.cancelable is false
</span><span class="lines">@@ -37,12 +37,12 @@
</span><span class="cx"> PASS testEvent.eventPhase is Event.NONE
</span><span class="cx">
</span><span class="cx"> PASS testEvent.initEvent("bar", false, true) did not throw exception.
</span><del>-PASS event.type is "bar"
-PASS event.bubbles is false
-PASS event.cancelable is true
-PASS event.target is null
-PASS event.currentTarget is null
-PASS event.eventPhase is Event.NONE
</del><ins>+PASS testEvent.type is "bar"
+PASS testEvent.bubbles is false
+PASS testEvent.cancelable is true
+PASS testEvent.target is null
+PASS testEvent.currentTarget is null
+PASS testEvent.eventPhase is Event.NONE
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsinitEventafterdispatchhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/initEvent-after-dispatch.html (204287 => 204288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/initEvent-after-dispatch.html 2016-08-09 18:06:30 UTC (rev 204287)
+++ trunk/LayoutTests/fast/events/initEvent-after-dispatch.html 2016-08-09 18:52:11 UTC (rev 204288)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> // It should not be possible to re-initialize an event being dispatched.
</span><del>- shouldNotThrow('testEvent.initEvent("bar", false, true)');
</del><ins>+ shouldNotThrow('event.initEvent("bar", false, true)');
</ins><span class="cx"> shouldBeEqualToString("event.type", "foo");
</span><span class="cx"> shouldBeTrue("event.bubbles");
</span><span class="cx"> shouldBeFalse("event.cancelable");
</span><span class="lines">@@ -51,12 +51,12 @@
</span><span class="cx"> // It should now be possible to re-initialize the event.
</span><span class="cx"> debug("");
</span><span class="cx"> shouldNotThrow('testEvent.initEvent("bar", false, true)');
</span><del>-shouldBeEqualToString("event.type", "bar");
-shouldBeFalse("event.bubbles");
-shouldBeTrue("event.cancelable");
-shouldBeNull("event.target");
-shouldBeNull("event.currentTarget");
-shouldBe("event.eventPhase", "Event.NONE");
</del><ins>+shouldBeEqualToString("testEvent.type", "bar");
+shouldBeFalse("testEvent.bubbles");
+shouldBeTrue("testEvent.cancelable");
+shouldBeNull("testEvent.target");
+shouldBeNull("testEvent.currentTarget");
+shouldBe("testEvent.eventPhase", "Event.NONE");
</ins><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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204287 => 204288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-09 18:06:30 UTC (rev 204287)
+++ trunk/Source/WebCore/ChangeLog 2016-08-09 18:52:11 UTC (rev 204288)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-09 Chris Dumez <cdumez@apple.com>
+
+ It should be possible to re-initialize a CustomEvent after it's been dispatched
+ https://bugs.webkit.org/show_bug.cgi?id=160664
+
+ Reviewed by Darin Adler.
+
+ It should be possible to re-initialize a CustomEvent after it's been dispatched:
+ - https://dom.spec.whatwg.org/#dom-customevent-initcustomevent
+
+ Test: fast/events/initCustomEvent-after-dispatch.html
+
+ * dom/CustomEvent.cpp:
+ (WebCore::CustomEvent::initCustomEvent):
+
</ins><span class="cx"> 2016-08-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of PluginStrategy
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomEvent.cpp (204287 => 204288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomEvent.cpp 2016-08-09 18:06:30 UTC (rev 204287)
+++ trunk/Source/WebCore/dom/CustomEvent.cpp 2016-08-09 18:52:11 UTC (rev 204288)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> void CustomEvent::initCustomEvent(JSC::ExecState& state, const AtomicString& type, bool canBubble, bool cancelable, JSC::JSValue detail)
</span><span class="cx"> {
</span><del>- if (dispatched())
</del><ins>+ if (isBeingDispatched())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> initEvent(type, canBubble, cancelable);
</span></span></pre>
</div>
</div>
</body>
</html>