<!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>[196588] 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/196588">196588</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-02-15 12:09:54 -0800 (Mon, 15 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/196563">r196563</a>): It is no longer possible to call window.addEventListener without an explicit 'this'
https://bugs.webkit.org/show_bug.cgi?id=154245
Reviewed by Ryosuke Niwa.
Source/WebCore:
This patch adds support for calling the EventListener API without an
explicit 'this' value. If no explicit 'this' value is passed, then we
fall back to using the global object. This matches Chrome and Firefox's
behavior. It also fixes the Dromaeo/cssquery-dojo.html test.
Test: fast/dom/Window/addEventListener-implicit-this.html
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateFunctionCastedThis):
LayoutTests:
Add a layout test to cover the use of the EventListener API without an
explicit 'this' value.
* fast/dom/Window/addEventListener-implicit-this-expected.txt: Added.
* fast/dom/Window/addEventListener-implicit-this.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="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomWindowaddEventListenerimplicitthisexpectedtxt">trunk/LayoutTests/fast/dom/Window/addEventListener-implicit-this-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowaddEventListenerimplicitthishtml">trunk/LayoutTests/fast/dom/Window/addEventListener-implicit-this.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196587 => 196588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-15 20:09:07 UTC (rev 196587)
+++ trunk/LayoutTests/ChangeLog 2016-02-15 20:09:54 UTC (rev 196588)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-02-15 Chris Dumez <cdumez@apple.com>
+
+ Regression(r196563): It is no longer possible to call window.addEventListener without an explicit 'this'
+ https://bugs.webkit.org/show_bug.cgi?id=154245
+
+ Reviewed by Ryosuke Niwa.
+
+ Add a layout test to cover the use of the EventListener API without an
+ explicit 'this' value.
+
+ * fast/dom/Window/addEventListener-implicit-this-expected.txt: Added.
+ * fast/dom/Window/addEventListener-implicit-this.html: Added.
+
</ins><span class="cx"> 2016-02-15 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: 'sandbox' should be ignored in report-only mode
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowaddEventListenerimplicitthisexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Window/addEventListener-implicit-this-expected.txt (0 => 196588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/addEventListener-implicit-this-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/Window/addEventListener-implicit-this-expected.txt 2016-02-15 20:09:54 UTC (rev 196588)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Checks that the Window's EventListener API can be called without an explicit 'this' value.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS addEventListenerFunction.call(undefined, 'myevent', function() { wasWindowEventListenerCalled = true; }); did not throw exception.
+PASS dispatchEventFunction.call(undefined, new Event('myevent')) is true
+PASS wasWindowEventListenerCalled is true
+PASS bodyDispatchEventFunction.call(undefined, new Event('myevent')) is true
+PASS wasWindowEventListenerCalled is true
+PASS xhrDispatchEventFunction.call(undefined, new Event('myevent')) is true
+PASS wasWindowEventListenerCalled is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowaddEventListenerimplicitthishtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Window/addEventListener-implicit-this.html (0 => 196588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/addEventListener-implicit-this.html (rev 0)
+++ trunk/LayoutTests/fast/dom/Window/addEventListener-implicit-this.html 2016-02-15 20:09:54 UTC (rev 196588)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../../resources/js-test-pre.js"></script>
+<script>
+description("Checks that the Window's EventListener API can be called without an explicit 'this' value.");
+
+var wasWindowEventListenerCalled = false;
+
+var addEventListenerFunction = window.addEventListener;
+shouldNotThrow("addEventListenerFunction.call(undefined, 'myevent', function() { wasWindowEventListenerCalled = true; });");
+
+var dispatchEventFunction = window.dispatchEvent;
+shouldBeTrue("dispatchEventFunction.call(undefined, new Event('myevent'))");
+
+shouldBeTrue("wasWindowEventListenerCalled");
+
+// As of early 2016, this matches Firefox and Chrome's behavior: We fall back to using the global window, even if the function
+// came from a non-Window object.
+wasWindowEventListenerCalled = false;
+
+bodyDispatchEventFunction = document.body.dispatchEvent;
+shouldBeTrue("bodyDispatchEventFunction.call(undefined, new Event('myevent'))");
+
+shouldBeTrue("wasWindowEventListenerCalled");
+
+wasWindowEventListenerCalled = false;
+
+var xhr = new XMLHttpRequest();
+xhrDispatchEventFunction = xhr.dispatchEvent;
+shouldBeTrue("xhrDispatchEventFunction.call(undefined, new Event('myevent'))");
+
+shouldBeTrue("wasWindowEventListenerCalled");
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196587 => 196588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-15 20:09:07 UTC (rev 196587)
+++ trunk/Source/WebCore/ChangeLog 2016-02-15 20:09:54 UTC (rev 196588)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-02-15 Chris Dumez <cdumez@apple.com>
+
+ Regression(r196563): It is no longer possible to call window.addEventListener without an explicit 'this'
+ https://bugs.webkit.org/show_bug.cgi?id=154245
+
+ Reviewed by Ryosuke Niwa.
+
+ This patch adds support for calling the EventListener API without an
+ explicit 'this' value. If no explicit 'this' value is passed, then we
+ fall back to using the global object. This matches Chrome and Firefox's
+ behavior. It also fixes the Dromaeo/cssquery-dojo.html test.
+
+ Test: fast/dom/Window/addEventListener-implicit-this.html
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateFunctionCastedThis):
+
</ins><span class="cx"> 2016-02-14 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Organize, deduplicate & comment JSDOMWindowCustom getOwnPropertySlot
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (196587 => 196588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-02-15 20:09:07 UTC (rev 196587)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-02-15 20:09:54 UTC (rev 196588)
</span><span class="lines">@@ -3235,7 +3235,14 @@
</span><span class="cx"> push(@implContent, " return throwVMTypeError(state);\n");
</span><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " JSValue thisValue = state->thisValue();\n");
</span><del>- push(@implContent, " auto castedThis = " . GetCastingHelperForThisObject($interface) . "(thisValue);\n");
</del><ins>+ my $castingHelper = GetCastingHelperForThisObject($interface);
+ if ($interfaceName eq "EventTarget") {
+ # We allow calling the EventTarget API without an explicit 'this' value and fall back to using the global object instead.
+ # As of early 2016, this matches Firefox and Chrome's behavior.
+ push(@implContent, " auto castedThis = thisValue.isUndefinedOrNull() ? $castingHelper(thisValue.toThis(state, NotStrictMode)) : $castingHelper(thisValue);\n");
+ } else {
+ push(@implContent, " auto castedThis = $castingHelper(thisValue);\n");
+ }
</ins><span class="cx"> my $domFunctionName = $function->signature->name;
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!castedThis))\n");
</span><span class="cx"> push(@implContent, " return throwThisTypeError(*state, \"$interfaceName\", \"$domFunctionName\");\n");
</span></span></pre>
</div>
</div>
</body>
</html>