<!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>[212609] 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/212609">212609</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-02-18 15:58:57 -0800 (Sat, 18 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Recursive MessagePort.postMessage() calls causes tab to become unresponsive
https://bugs.webkit.org/show_bug.cgi?id=168548
<rdar://problem/29808005>
Reviewed by Darin Adler.
Source/WebCore:
MessagePort::dispatchMessages() was getting messages one by one of the
channel's MessageQueue and firing the MessageEvent for each of them.
The issue is that we can get stuck in an infinite loop if the
MessageEvent handler posts a message on the same post.
To address the issue, we now takes all messages from the queue before
iterating over them to fire the event. This way, if new messages are
added to the queue in one of the MessageEvent handlers, they will not
be processed until the next event loop iteration, as is expected.
Test: fast/events/message-port-postMessage-recursive.html
* dom/MessagePort.cpp:
(WebCore::MessagePort::dispatchMessages):
* dom/MessagePortChannel.h:
(WebCore::MessagePortChannel::EventData::EventData):
* dom/default/PlatformMessagePortChannel.cpp:
(WebCore::MessagePortChannel::postMessageToRemote):
* dom/default/PlatformMessagePortChannel.h:
(WebCore::PlatformMessagePortChannel::MessagePortQueue::takeMessage):
(WebCore::PlatformMessagePortChannel::MessagePortQueue::takeAllMessages):
(WebCore::PlatformMessagePortChannel::MessagePortQueue::appendAndCheckEmpty):
Source/WTF:
Add API to retrieve all messages in the queue at once.
* wtf/MessageQueue.h:
LayoutTests:
Add layout test coverage. The test used to time out, it now passes.
The test also passes on Firefox and Chrome.
* fast/events/message-port-postMessage-recursive-expected.txt: Added.
* fast/events/message-port-postMessage-recursive.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMessageQueueh">trunk/Source/WTF/wtf/MessageQueue.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomMessagePortcpp">trunk/Source/WebCore/dom/MessagePort.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMessagePortChannelh">trunk/Source/WebCore/dom/MessagePortChannel.h</a></li>
<li><a href="#trunkSourceWebCoredomdefaultPlatformMessagePortChannelcpp">trunk/Source/WebCore/dom/default/PlatformMessagePortChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoredomdefaultPlatformMessagePortChannelh">trunk/Source/WebCore/dom/default/PlatformMessagePortChannel.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventsmessageportpostMessagerecursiveexpectedtxt">trunk/LayoutTests/fast/events/message-port-postMessage-recursive-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsmessageportpostMessagerecursivehtml">trunk/LayoutTests/fast/events/message-port-postMessage-recursive.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212608 => 212609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-18 23:08:17 UTC (rev 212608)
+++ trunk/LayoutTests/ChangeLog 2017-02-18 23:58:57 UTC (rev 212609)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-18 Chris Dumez <cdumez@apple.com>
+
+ Recursive MessagePort.postMessage() calls causes tab to become unresponsive
+ https://bugs.webkit.org/show_bug.cgi?id=168548
+ <rdar://problem/29808005>
+
+ Reviewed by Darin Adler.
+
+ Add layout test coverage. The test used to time out, it now passes.
+ The test also passes on Firefox and Chrome.
+
+ * fast/events/message-port-postMessage-recursive-expected.txt: Added.
+ * fast/events/message-port-postMessage-recursive.html: Added.
+
</ins><span class="cx"> 2017-02-18 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK+ gardening. Update expectations of a few more tests that are failing.
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsmessageportpostMessagerecursiveexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/message-port-postMessage-recursive-expected.txt (0 => 212609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/message-port-postMessage-recursive-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/message-port-postMessage-recursive-expected.txt 2017-02-18 23:58:57 UTC (rev 212609)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests that recursive calls to MessagePort.postMessage() do not preempt timers.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Timer has fired.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventsmessageportpostMessagerecursivehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/message-port-postMessage-recursive.html (0 => 212609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/message-port-postMessage-recursive.html (rev 0)
+++ trunk/LayoutTests/fast/events/message-port-postMessage-recursive.html 2017-02-18 23:58:57 UTC (rev 212609)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+description("Tests that recursive calls to MessagePort.postMessage() do not preempt timers.");
+jsTestIsAsync = true;
+
+function simulateSetImmediate()
+{
+ var channel = new MessageChannel();
+ // Use a fifo linked list to call callbacks in the right order.
+ var head = {};
+ var tail = head;
+ channel['port1'].onmessage = function() {
+ if (head.next != null) {
+ head = head.next;
+ var cb = head.cb;
+ head.cb = null;
+ cb();
+ }
+ };
+ return function(cb) {
+ tail.next = {cb: cb};
+ tail = tail.next;
+ channel['port2'].postMessage(0);
+ };
+}
+
+window.setImmediate = simulateSetImmediate();
+
+var shouldExit = false;
+
+function iterate() {
+ if (shouldExit) {
+ testPassed("Timer has fired.");
+ finishJSTest();
+ return;
+ }
+ setImmediate(iterate);
+}
+
+setImmediate(iterate);
+setTimeout(function() {
+ shouldExit = true;
+}, 10);
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (212608 => 212609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-02-18 23:08:17 UTC (rev 212608)
+++ trunk/Source/WTF/ChangeLog 2017-02-18 23:58:57 UTC (rev 212609)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-18 Chris Dumez <cdumez@apple.com>
+
+ Recursive MessagePort.postMessage() calls causes tab to become unresponsive
+ https://bugs.webkit.org/show_bug.cgi?id=168548
+ <rdar://problem/29808005>
+
+ Reviewed by Darin Adler.
+
+ Add API to retrieve all messages in the queue at once.
+
+ * wtf/MessageQueue.h:
+
</ins><span class="cx"> 2017-02-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove EFL-specific files in Source.
</span></span></pre></div>
<a id="trunkSourceWTFwtfMessageQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MessageQueue.h (212608 => 212609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MessageQueue.h 2017-02-18 23:08:17 UTC (rev 212608)
+++ trunk/Source/WTF/wtf/MessageQueue.h 2017-02-18 23:58:57 UTC (rev 212609)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DataType> waitForMessage();
</span><span class="cx"> std::unique_ptr<DataType> tryGetMessage();
</span><ins>+ Deque<std::unique_ptr<DataType>> takeAllMessages();
</ins><span class="cx"> std::unique_ptr<DataType> tryGetMessageIgnoringKilled();
</span><span class="cx"> template<typename Predicate>
</span><span class="cx"> std::unique_ptr<DataType> waitForMessageFilteredWithTimeout(MessageQueueWaitResult&, Predicate&&, WallTime absoluteTime);
</span><span class="lines">@@ -185,6 +186,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename DataType>
</span><ins>+ inline auto MessageQueue<DataType>::takeAllMessages() -> Deque<std::unique_ptr<DataType>>
+ {
+ LockHolder lock(m_mutex);
+ if (m_killed)
+ return { };
+ return WTFMove(m_queue);
+ }
+
+ template<typename DataType>
</ins><span class="cx"> inline auto MessageQueue<DataType>::tryGetMessageIgnoringKilled() -> std::unique_ptr<DataType>
</span><span class="cx"> {
</span><span class="cx"> LockHolder lock(m_mutex);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212608 => 212609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-18 23:08:17 UTC (rev 212608)
+++ trunk/Source/WebCore/ChangeLog 2017-02-18 23:58:57 UTC (rev 212609)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2017-02-18 Chris Dumez <cdumez@apple.com>
+
+ Recursive MessagePort.postMessage() calls causes tab to become unresponsive
+ https://bugs.webkit.org/show_bug.cgi?id=168548
+ <rdar://problem/29808005>
+
+ Reviewed by Darin Adler.
+
+ MessagePort::dispatchMessages() was getting messages one by one of the
+ channel's MessageQueue and firing the MessageEvent for each of them.
+ The issue is that we can get stuck in an infinite loop if the
+ MessageEvent handler posts a message on the same post.
+
+ To address the issue, we now takes all messages from the queue before
+ iterating over them to fire the event. This way, if new messages are
+ added to the queue in one of the MessageEvent handlers, they will not
+ be processed until the next event loop iteration, as is expected.
+
+ Test: fast/events/message-port-postMessage-recursive.html
+
+ * dom/MessagePort.cpp:
+ (WebCore::MessagePort::dispatchMessages):
+ * dom/MessagePortChannel.h:
+ (WebCore::MessagePortChannel::EventData::EventData):
+ * dom/default/PlatformMessagePortChannel.cpp:
+ (WebCore::MessagePortChannel::postMessageToRemote):
+ * dom/default/PlatformMessagePortChannel.h:
+ (WebCore::PlatformMessagePortChannel::MessagePortQueue::takeMessage):
+ (WebCore::PlatformMessagePortChannel::MessagePortQueue::takeAllMessages):
+ (WebCore::PlatformMessagePortChannel::MessagePortQueue::appendAndCheckEmpty):
+
</ins><span class="cx"> 2017-02-18 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Remove COORDINATED_GRAPHICS_MULTIPROCESS
</span></span></pre></div>
<a id="trunkSourceWebCoredomMessagePortcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MessagePort.cpp (212608 => 212609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MessagePort.cpp 2017-02-18 23:08:17 UTC (rev 212608)
+++ trunk/Source/WebCore/dom/MessagePort.cpp 2017-02-18 23:58:57 UTC (rev 212609)
</span><span class="lines">@@ -146,16 +146,19 @@
</span><span class="cx"> // The HTML5 spec specifies that any messages sent to a document that is not fully active should be dropped, so this behavior is OK.
</span><span class="cx"> ASSERT(started());
</span><span class="cx">
</span><del>- RefPtr<SerializedScriptValue> message;
- std::unique_ptr<MessagePortChannelArray> channels;
- while (m_entangledChannel && m_entangledChannel->tryGetMessageFromRemote(message, channels)) {
</del><ins>+ if (!m_entangledChannel)
+ return;
</ins><span class="cx">
</span><ins>+ bool contextIsWorker = is<WorkerGlobalScope>(*m_scriptExecutionContext);
+
+ auto pendingMessages = m_entangledChannel->takeAllMessagesFromRemote();
+ for (auto& message : pendingMessages) {
</ins><span class="cx"> // close() in Worker onmessage handler should prevent next message from dispatching.
</span><del>- if (is<WorkerGlobalScope>(*m_scriptExecutionContext) && downcast<WorkerGlobalScope>(*m_scriptExecutionContext).isClosing())
</del><ins>+ if (contextIsWorker && downcast<WorkerGlobalScope>(*m_scriptExecutionContext).isClosing())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- auto ports = MessagePort::entanglePorts(*m_scriptExecutionContext, WTFMove(channels));
- dispatchEvent(MessageEvent::create(WTFMove(ports), WTFMove(message)));
</del><ins>+ auto ports = MessagePort::entanglePorts(*m_scriptExecutionContext, WTFMove(message->channels));
+ dispatchEvent(MessageEvent::create(WTFMove(ports), WTFMove(message->message)));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomMessagePortChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MessagePortChannel.h (212608 => 212609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MessagePortChannel.h 2017-02-18 23:08:17 UTC (rev 212608)
+++ trunk/Source/WebCore/dom/MessagePortChannel.h 2017-02-18 23:58:57 UTC (rev 212609)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><span class="cx"> #include <memory>
</span><ins>+#include <wtf/Deque.h>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -51,6 +52,16 @@
</span><span class="cx"> class MessagePortChannel {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(MessagePortChannel); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><ins>+ struct EventData {
+ EventData(Ref<SerializedScriptValue>&& message, std::unique_ptr<MessagePortChannelArray>&& channels)
+ : message(WTFMove(message))
+ , channels(WTFMove(channels))
+ { }
+
+ Ref<SerializedScriptValue> message;
+ std::unique_ptr<MessagePortChannelArray> channels;
+ };
+
</ins><span class="cx"> explicit MessagePortChannel(RefPtr<PlatformMessagePortChannel>&&);
</span><span class="cx"> static void createChannel(MessagePort*, MessagePort*);
</span><span class="cx">
</span><span class="lines">@@ -71,11 +82,13 @@
</span><span class="cx"> bool hasPendingActivity();
</span><span class="cx">
</span><span class="cx"> // Sends a message and optional cloned port to the remote port.
</span><del>- void postMessageToRemote(RefPtr<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>);
</del><ins>+ void postMessageToRemote(Ref<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>);
</ins><span class="cx">
</span><span class="cx"> // Extracts a message from the message queue for this port.
</span><del>- bool tryGetMessageFromRemote(RefPtr<SerializedScriptValue>&, std::unique_ptr<MessagePortChannelArray>&);
</del><ins>+ std::unique_ptr<EventData> takeMessageFromRemote();
</ins><span class="cx">
</span><ins>+ Deque<std::unique_ptr<EventData>> takeAllMessagesFromRemote();
+
</ins><span class="cx"> // Returns the entangled port if run by the same thread (see MessagePort::locallyEntangledPort() for more details).
</span><span class="cx"> MessagePort* locallyEntangledPort(const ScriptExecutionContext*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomdefaultPlatformMessagePortChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/default/PlatformMessagePortChannel.cpp (212608 => 212609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/default/PlatformMessagePortChannel.cpp 2017-02-18 23:08:17 UTC (rev 212608)
+++ trunk/Source/WebCore/dom/default/PlatformMessagePortChannel.cpp 2017-02-18 23:58:57 UTC (rev 212609)
</span><span class="lines">@@ -37,12 +37,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PlatformMessagePortChannel::EventData::EventData(RefPtr<SerializedScriptValue>&& message, std::unique_ptr<MessagePortChannelArray> channels)
- : m_message(WTFMove(message))
- , m_channels(WTFMove(channels))
-{
-}
-
</del><span class="cx"> void MessagePortChannel::createChannel(MessagePort* port1, MessagePort* port2)
</span><span class="cx"> {
</span><span class="cx"> Ref<PlatformMessagePortChannel::MessagePortQueue> queue1 = PlatformMessagePortChannel::MessagePortQueue::create();
</span><span class="lines">@@ -86,27 +80,26 @@
</span><span class="cx"> remote->setRemotePort(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MessagePortChannel::postMessageToRemote(RefPtr<SerializedScriptValue>&& message, std::unique_ptr<MessagePortChannelArray> channels)
</del><ins>+void MessagePortChannel::postMessageToRemote(Ref<SerializedScriptValue>&& message, std::unique_ptr<MessagePortChannelArray> channels)
</ins><span class="cx"> {
</span><span class="cx"> LockHolder lock(m_channel->m_mutex);
</span><span class="cx"> if (!m_channel->m_outgoingQueue)
</span><span class="cx"> return;
</span><del>- bool wasEmpty = m_channel->m_outgoingQueue->appendAndCheckEmpty(std::make_unique<PlatformMessagePortChannel::EventData>(WTFMove(message), WTFMove(channels)));
</del><ins>+ bool wasEmpty = m_channel->m_outgoingQueue->appendAndCheckEmpty(std::make_unique<EventData>(WTFMove(message), WTFMove(channels)));
</ins><span class="cx"> if (wasEmpty && m_channel->m_remotePort)
</span><span class="cx"> m_channel->m_remotePort->messageAvailable();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MessagePortChannel::tryGetMessageFromRemote(RefPtr<SerializedScriptValue>& message, std::unique_ptr<MessagePortChannelArray>& channels)
</del><ins>+auto MessagePortChannel::takeMessageFromRemote() -> std::unique_ptr<EventData>
</ins><span class="cx"> {
</span><span class="cx"> LockHolder lock(m_channel->m_mutex);
</span><del>- auto result = m_channel->m_incomingQueue->tryGetMessage();
- if (!result)
- return false;
</del><ins>+ return m_channel->m_incomingQueue->takeMessage();
+}
</ins><span class="cx">
</span><del>- message = result->message();
- channels = result->channels();
-
- return true;
</del><ins>+auto MessagePortChannel::takeAllMessagesFromRemote() -> Deque<std::unique_ptr<EventData>>
+{
+ LockHolder lock(m_channel->m_mutex);
+ return m_channel->m_incomingQueue->takeAllMessages();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MessagePortChannel::close()
</span></span></pre></div>
<a id="trunkSourceWebCoredomdefaultPlatformMessagePortChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/default/PlatformMessagePortChannel.h (212608 => 212609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/default/PlatformMessagePortChannel.h 2017-02-18 23:08:17 UTC (rev 212608)
+++ trunk/Source/WebCore/dom/default/PlatformMessagePortChannel.h 2017-02-18 23:58:57 UTC (rev 212609)
</span><span class="lines">@@ -43,31 +43,23 @@
</span><span class="cx"> // The goal of this implementation is to eliminate contention except when cloning or closing the port, so each side of the channel has its own separate mutex.
</span><span class="cx"> class PlatformMessagePortChannel : public ThreadSafeRefCounted<PlatformMessagePortChannel> {
</span><span class="cx"> public:
</span><del>- class EventData {
- WTF_MAKE_NONCOPYABLE(EventData); WTF_MAKE_FAST_ALLOCATED;
- public:
- EventData(RefPtr<SerializedScriptValue>&& message, std::unique_ptr<MessagePortChannelArray>);
-
- RefPtr<SerializedScriptValue> message() { return m_message; }
- std::unique_ptr<MessagePortChannelArray> channels() { return WTFMove(m_channels); }
-
- private:
- RefPtr<SerializedScriptValue> m_message;
- std::unique_ptr<MessagePortChannelArray> m_channels;
- };
-
</del><span class="cx"> // Wrapper for MessageQueue that allows us to do thread safe sharing by two proxies.
</span><span class="cx"> class MessagePortQueue : public ThreadSafeRefCounted<MessagePortQueue> {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<MessagePortQueue> create() { return adoptRef(*new MessagePortQueue()); }
</span><span class="cx">
</span><del>- std::unique_ptr<PlatformMessagePortChannel::EventData> tryGetMessage()
</del><ins>+ std::unique_ptr<MessagePortChannel::EventData> takeMessage()
</ins><span class="cx"> {
</span><span class="cx"> return m_queue.tryGetMessage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool appendAndCheckEmpty(std::unique_ptr<PlatformMessagePortChannel::EventData> message)
</del><ins>+ Deque<std::unique_ptr<MessagePortChannel::EventData>> takeAllMessages()
</ins><span class="cx"> {
</span><ins>+ return m_queue.takeAllMessages();
+ }
+
+ bool appendAndCheckEmpty(std::unique_ptr<MessagePortChannel::EventData>&& message)
+ {
</ins><span class="cx"> return m_queue.appendAndCheckEmpty(WTFMove(message));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -79,7 +71,7 @@
</span><span class="cx"> private:
</span><span class="cx"> MessagePortQueue() { }
</span><span class="cx">
</span><del>- MessageQueue<PlatformMessagePortChannel::EventData> m_queue;
</del><ins>+ MessageQueue<MessagePortChannel::EventData> m_queue;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ~PlatformMessagePortChannel();
</span></span></pre>
</div>
</div>
</body>
</html>