<!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>[201835] 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/201835">201835</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-08 15:14:55 -0700 (Wed, 08 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>First parameter to MessagePort / DedicatedWorkerGlobalScope.postMessage() should be mandatory
https://bugs.webkit.org/show_bug.cgi?id=158540
Reviewed by Geoffrey Garen.
Source/WebCore:
First parameter to MessagePort / DedicatedWorkerGlobalScope.postMessage() should be mandatory:
- https://html.spec.whatwg.org/multipage/comms.html#messageport
- https://html.spec.whatwg.org/multipage/workers.html#dedicated-workers-and-the-dedicatedworkerglobalscope-interface
Previously, WebKit send a bogus MessageEvent whose data attribute is undefined. This would
cause a testharness error when running the following W3C test:
- http://w3c-test.org/workers/interfaces.worker
Firefox and Chrome already correctly throw in this case. Our Window.postMessage() API is also
already throwing in this case.
Test: fast/workers/postMessage-missing-parameter.html
* bindings/js/JSMessagePortCustom.h:
(WebCore::handlePostMessage):
LayoutTests:
Add test coverage.
* fast/files/workers/inline-worker-via-blob-url.html:
* fast/workers/postMessage-missing-parameter-expected.txt: Added.
* fast/workers/postMessage-missing-parameter.html: Added.
* fast/workers/worker-messageport-expected.txt:
* fast/workers/worker-messageport.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastfilesworkersinlineworkerviabloburlhtml">trunk/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html</a></li>
<li><a href="#trunkLayoutTestsfastworkersworkermessageportexpectedtxt">trunk/LayoutTests/fast/workers/worker-messageport-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastworkersworkermessageporthtml">trunk/LayoutTests/fast/workers/worker-messageport.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMessagePortCustomh">trunk/Source/WebCore/bindings/js/JSMessagePortCustom.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastworkerspostMessagemissingparameterexpectedtxt">trunk/LayoutTests/fast/workers/postMessage-missing-parameter-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastworkerspostMessagemissingparameterhtml">trunk/LayoutTests/fast/workers/postMessage-missing-parameter.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201834 => 201835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-08 21:49:32 UTC (rev 201834)
+++ trunk/LayoutTests/ChangeLog 2016-06-08 22:14:55 UTC (rev 201835)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-08 Chris Dumez <cdumez@apple.com>
+
+ First parameter to MessagePort / DedicatedWorkerGlobalScope.postMessage() should be mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=158540
+
+ Reviewed by Geoffrey Garen.
+
+ Add test coverage.
+
+ * fast/files/workers/inline-worker-via-blob-url.html:
+ * fast/workers/postMessage-missing-parameter-expected.txt: Added.
+ * fast/workers/postMessage-missing-parameter.html: Added.
+ * fast/workers/worker-messageport-expected.txt:
+ * fast/workers/worker-messageport.html:
+
</ins><span class="cx"> 2016-06-08 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> For keyboard users, activating a fragment URL should transfer focus and caret to the destination
</span></span></pre></div>
<a id="trunkLayoutTestsfastfilesworkersinlineworkerviabloburlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html (201834 => 201835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html 2016-06-08 21:49:32 UTC (rev 201834)
+++ trunk/LayoutTests/fast/files/workers/inline-worker-via-blob-url.html 2016-06-08 22:14:55 UTC (rev 201835)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> if (testRunner.notifyDone)
</span><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> };
</span><del>- worker.postMessage();
</del><ins>+ worker.postMessage("message");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.testRunner) {
</span></span></pre></div>
<a id="trunkLayoutTestsfastworkerspostMessagemissingparameterexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/workers/postMessage-missing-parameter-expected.txt (0 => 201835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/postMessage-missing-parameter-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/workers/postMessage-missing-parameter-expected.txt 2016-06-08 22:14:55 UTC (rev 201835)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests that calling DedicatedWorkerGlobalScope.postMessage() without parameter throws an exception
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+postMessage(): TypeError: Not enough arguments
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastworkerspostMessagemissingparameterhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/workers/postMessage-missing-parameter.html (0 => 201835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/postMessage-missing-parameter.html (rev 0)
+++ trunk/LayoutTests/fast/workers/postMessage-missing-parameter.html 2016-06-08 22:14:55 UTC (rev 201835)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="resources/worker-create-common.js"></script>
+<script>
+
+var jsTestIsAsync = true;
+
+description('Tests that calling DedicatedWorkerGlobalScope.postMessage() without parameter throws an exception');
+
+var worker = createWorker();
+worker.postMessage("eval postMessage()");
+worker.postMessage("eval DONE");
+
+worker.onmessage = function(evt) {
+ if (!/DONE/.test(evt.data))
+ debug(evt.data.replace(new RegExp("/.*LayoutTests"), "<...>"));
+ else
+ finishJSTest();
+};
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastworkersworkermessageportexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/workers/worker-messageport-expected.txt (201834 => 201835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/worker-messageport-expected.txt 2016-06-08 21:49:32 UTC (rev 201834)
+++ trunk/LayoutTests/fast/workers/worker-messageport-expected.txt 2016-06-08 22:14:55 UTC (rev 201835)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> PASS: Received message port
</span><span class="cx"> PASS: Received response from Worker via MessagePort
</span><span class="cx"> PASS: Got port from worker
</span><ins>+PASS: Calling MessagePort.postMessage() without parameter threw exception: TypeError: Not enough arguments
</ins><span class="cx"> PASS: Received final response from worker
</span><span class="cx"> PASS: Got 1000 messages
</span><span class="cx"> DONE
</span></span></pre></div>
<a id="trunkLayoutTestsfastworkersworkermessageporthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/workers/worker-messageport.html (201834 => 201835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/workers/worker-messageport.html 2016-06-08 21:49:32 UTC (rev 201834)
+++ trunk/LayoutTests/fast/workers/worker-messageport.html 2016-06-08 22:14:55 UTC (rev 201835)
</span><span class="lines">@@ -51,6 +51,13 @@
</span><span class="cx"> log("FAIL: Got the wrong number of ports from worker: " + evt.ports.length);
</span><span class="cx"> } else {
</span><span class="cx"> log("PASS: Got port from worker");
</span><ins>+ try {
+ // Missing parameter, should throw.
+ evt.ports[0].postMessage();
+ log("FAIL: Calling MessagePort.postMessage() without parameter did not throw.");
+ } catch (e) {
+ log("PASS: Calling MessagePort.postMessage() without parameter threw exception: " + e);
+ }
</ins><span class="cx"> evt.ports[0].postMessage("ping");
</span><span class="cx"> evt.ports[0].onmessage = function(evt) {
</span><span class="cx"> if (evt.data == "pong") {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201834 => 201835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-08 21:49:32 UTC (rev 201834)
+++ trunk/Source/WebCore/ChangeLog 2016-06-08 22:14:55 UTC (rev 201835)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-06-08 Chris Dumez <cdumez@apple.com>
+
+ First parameter to MessagePort / DedicatedWorkerGlobalScope.postMessage() should be mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=158540
+
+ Reviewed by Geoffrey Garen.
+
+ First parameter to MessagePort / DedicatedWorkerGlobalScope.postMessage() should be mandatory:
+ - https://html.spec.whatwg.org/multipage/comms.html#messageport
+ - https://html.spec.whatwg.org/multipage/workers.html#dedicated-workers-and-the-dedicatedworkerglobalscope-interface
+
+ Previously, WebKit send a bogus MessageEvent whose data attribute is undefined. This would
+ cause a testharness error when running the following W3C test:
+ - http://w3c-test.org/workers/interfaces.worker
+
+ Firefox and Chrome already correctly throw in this case. Our Window.postMessage() API is also
+ already throwing in this case.
+
+ Test: fast/workers/postMessage-missing-parameter.html
+
+ * bindings/js/JSMessagePortCustom.h:
+ (WebCore::handlePostMessage):
+
</ins><span class="cx"> 2016-06-08 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove removeDirect
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMessagePortCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMessagePortCustom.h (201834 => 201835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMessagePortCustom.h 2016-06-08 21:49:32 UTC (rev 201834)
+++ trunk/Source/WebCore/bindings/js/JSMessagePortCustom.h 2016-06-08 22:14:55 UTC (rev 201835)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #define JSMessagePortCustom_h
</span><span class="cx">
</span><span class="cx"> #include "MessagePort.h"
</span><ins>+#include <runtime/Error.h>
</ins><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <runtime/JSCJSValue.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -49,10 +50,13 @@
</span><span class="cx"> template <typename T>
</span><span class="cx"> inline JSC::JSValue handlePostMessage(JSC::ExecState& state, T* impl)
</span><span class="cx"> {
</span><ins>+ if (UNLIKELY(state.argumentCount() < 1))
+ return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
+
</ins><span class="cx"> MessagePortArray portArray;
</span><span class="cx"> ArrayBufferArray arrayBufferArray;
</span><span class="cx"> fillMessagePortArray(state, state.argument(1), portArray, arrayBufferArray);
</span><del>- RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(&state, state.argument(0), &portArray, &arrayBufferArray);
</del><ins>+ RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(&state, state.uncheckedArgument(0), &portArray, &arrayBufferArray);
</ins><span class="cx"> if (state.hadException())
</span><span class="cx"> return JSC::jsUndefined();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>