<!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>[160309] 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/160309">160309</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-09 04:42:54 -0800 (Mon, 09 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: DataCloneError exception is not thrown when postMessage's second parameter is the source
port or the target port.
https://bugs.webkit.org/show_bug.cgi?id=124708
Patch by Michal Poteralski <m.poteralski@samsung.com> on 2013-12-09
Reviewed by Alexey Proskuryakov.
According to specification:
http://www.whatwg.org/specs/web-apps/current-work/multipage/web-messaging.html#dom-window-postmessage
If the method was invoked with a second argument transfer then if any of the objects in the
transfer are either the source port or the target port (if any), then a DataCloneError
exception should be thrown. Currently an InvalidStateError exception is thrown what is an
incorrect behaviour.
The proposed solution is change to the correct the exception value.
Tests: fast/dom/Window/postMessage-clone-port-error.html
* dom/MessagePort.cpp:
(WebCore::MessagePort::postMessage): Improve exception value
LayoutTests: DataCloneError exception is not thrown when postMessage's second parameter
is the source port or the target port.
https://bugs.webkit.org/show_bug.cgi?id=124708
Patch by Michal Poteralski <m.poteralski@samsung.com> on 2013-12-09
Reviewed by Alexey Proskuryakov.
Added layout test to check correctness of value thrown by postMessage:
* fast/dom/Window/postMessage-clone-port-error-expected.txt: Added.
* fast/dom/Window/postMessage-clone-port-error.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasteventsmessageportcloneexpectedtxt">trunk/LayoutTests/fast/events/message-port-clone-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsmessageportmultiexpectedtxt">trunk/LayoutTests/fast/events/message-port-multi-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomMessagePortcpp">trunk/Source/WebCore/dom/MessagePort.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomWindowpostMessagecloneporterrorexpectedtxt">trunk/LayoutTests/fast/dom/Window/postMessage-clone-port-error-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowpostMessagecloneporterrorhtml">trunk/LayoutTests/fast/dom/Window/postMessage-clone-port-error.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160308 => 160309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-09 12:28:44 UTC (rev 160308)
+++ trunk/LayoutTests/ChangeLog 2013-12-09 12:42:54 UTC (rev 160309)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-09 Michal Poteralski <m.poteralski@samsung.com>
+
+ DataCloneError exception is not thrown when postMessage's second parameter
+ is the source port or the target port.
+
+ https://bugs.webkit.org/show_bug.cgi?id=124708
+
+ Reviewed by Alexey Proskuryakov.
+
+ Added layout test to check correctness of value thrown by postMessage:
+
+ * fast/dom/Window/postMessage-clone-port-error-expected.txt: Added.
+ * fast/dom/Window/postMessage-clone-port-error.html: Added.
+
</ins><span class="cx"> 2013-12-09 Gustavo Noronha Silva <gns@gnome.org>
</span><span class="cx">
</span><span class="cx"> accessibility/press-targets-center-point.html should not depend on font layout
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowpostMessagecloneporterrorexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Window/postMessage-clone-port-error-expected.txt (0 => 160309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/postMessage-clone-port-error-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/Window/postMessage-clone-port-error-expected.txt 2013-12-09 12:42:54 UTC (rev 160309)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+PASS exName is "DataCloneError"
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowpostMessagecloneporterrorhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/Window/postMessage-clone-port-error.html (0 => 160309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/postMessage-clone-port-error.html (rev 0)
+++ trunk/LayoutTests/fast/dom/Window/postMessage-clone-port-error.html 2013-12-09 12:42:54 UTC (rev 160309)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<body onload="test();"></body>
+<script src="../../../resources/js-test-pre.js"></script>
+<script>
+var exName;
+function test() {
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ var channel = new MessageChannel();
+ channel.port1.start();
+
+ try {
+ channel.port1.postMessage("ports", [channel.port1]);
+ } catch(ex) {
+ exName = ex.name
+ shouldBeEqualToString("exName", "DataCloneError");
+ }
+}
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsmessageportcloneexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/message-port-clone-expected.txt (160308 => 160309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/message-port-clone-expected.txt 2013-12-09 12:28:44 UTC (rev 160308)
+++ trunk/LayoutTests/fast/events/message-port-clone-expected.txt 2013-12-09 12:42:54 UTC (rev 160309)
</span><span class="lines">@@ -2,8 +2,8 @@
</span><span class="cx">
</span><span class="cx"> Should be a series of SUCCESS messages, followed with DONE.
</span><span class="cx">
</span><del>-SUCCESS: Posting port to itself: Error: InvalidStateError: DOM Exception 11
-SUCCESS: Posting entangled port: Error: InvalidStateError: DOM Exception 11
</del><ins>+SUCCESS: Posting port to itself: Error: DataCloneError: DOM Exception 25
+SUCCESS: Posting entangled port: Error: DataCloneError: DOM Exception 25
</ins><span class="cx"> SUCCESS: Posting cloned port.
</span><span class="cx"> SUCCESS: Posted messages to cloned port.
</span><span class="cx"> SUCCESS: Cloned both endpoints of a channel.
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsmessageportmultiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/message-port-multi-expected.txt (160308 => 160309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/message-port-multi-expected.txt 2013-12-09 12:28:44 UTC (rev 160308)
+++ trunk/LayoutTests/fast/events/message-port-multi-expected.txt 2013-12-09 12:42:54 UTC (rev 160309)
</span><span class="lines">@@ -3,8 +3,8 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS channel.port1.postMessage("same port", [channel.port1]) threw exception Error: InvalidStateError: DOM Exception 11.
-PASS channel.port1.postMessage("entangled port", [channel.port2]) threw exception Error: InvalidStateError: DOM Exception 11.
</del><ins>+PASS channel.port1.postMessage("same port", [channel.port1]) threw exception Error: DataCloneError: DOM Exception 25.
+PASS channel.port1.postMessage("entangled port", [channel.port2]) threw exception Error: DataCloneError: DOM Exception 25.
</ins><span class="cx"> PASS channel.port1.postMessage("null port", [channel3.port1, null, channel3.port2]) threw exception Error: InvalidStateError: DOM Exception 11.
</span><span class="cx"> PASS channel.port1.postMessage("notAPort", [channel3.port1, {}, channel3.port2]) threw exception TypeError: Type error.
</span><span class="cx"> PASS channel.port1.postMessage("duplicate port", [channel3.port1, channel3.port1]) threw exception Error: InvalidStateError: DOM Exception 11.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160308 => 160309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-09 12:28:44 UTC (rev 160308)
+++ trunk/Source/WebCore/ChangeLog 2013-12-09 12:42:54 UTC (rev 160309)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2013-12-09 Michal Poteralski <m.poteralski@samsung.com>
+
+ DataCloneError exception is not thrown when postMessage's second parameter is the source
+ port or the target port.
+
+ https://bugs.webkit.org/show_bug.cgi?id=124708
+
+ Reviewed by Alexey Proskuryakov.
+
+ According to specification:
+ http://www.whatwg.org/specs/web-apps/current-work/multipage/web-messaging.html#dom-window-postmessage
+
+ If the method was invoked with a second argument transfer then if any of the objects in the
+ transfer are either the source port or the target port (if any), then a DataCloneError
+ exception should be thrown. Currently an InvalidStateError exception is thrown what is an
+ incorrect behaviour.
+
+ The proposed solution is change to the correct the exception value.
+
+ Tests: fast/dom/Window/postMessage-clone-port-error.html
+
+ * dom/MessagePort.cpp:
+ (WebCore::MessagePort::postMessage): Improve exception value
+
</ins><span class="cx"> 2013-12-09 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix the GTK+ build with NetworkProcess enabled.
</span></span></pre></div>
<a id="trunkSourceWebCoredomMessagePortcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MessagePort.cpp (160308 => 160309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MessagePort.cpp 2013-12-09 12:28:44 UTC (rev 160308)
+++ trunk/Source/WebCore/dom/MessagePort.cpp 2013-12-09 12:42:54 UTC (rev 160309)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> for (unsigned int i = 0; i < ports->size(); ++i) {
</span><span class="cx"> MessagePort* dataPort = (*ports)[i].get();
</span><span class="cx"> if (dataPort == this || m_entangledChannel->isConnectedTo(dataPort)) {
</span><del>- ec = INVALID_STATE_ERR;
</del><ins>+ ec = DATA_CLONE_ERR;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>