<!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>[205129] trunk/Source/WebKit2</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/205129">205129</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-08-29 11:45:56 -0700 (Mon, 29 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move some structs into Connection.cpp
https://bugs.webkit.org/show_bug.cgi?id=161320
Reviewed by Darin Adler.
* Platform/IPC/Connection.cpp:
(IPC::Connection::PendingSyncReply::PendingSyncReply):
* Platform/IPC/Connection.h:
(IPC::Connection::PendingSyncReply::PendingSyncReply): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205128 => 205129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-29 18:26:52 UTC (rev 205128)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-29 18:45:56 UTC (rev 205129)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-29 Anders Carlsson <andersca@apple.com>
+
+ Move some structs into Connection.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=161320
+
+ Reviewed by Darin Adler.
+
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::PendingSyncReply::PendingSyncReply):
+ * Platform/IPC/Connection.h:
+ (IPC::Connection::PendingSyncReply::PendingSyncReply): Deleted.
+
</ins><span class="cx"> 2016-08-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove sync message sending from secondary threads
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (205128 => 205129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2016-08-29 18:26:52 UTC (rev 205128)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2016-08-29 18:45:56 UTC (rev 205129)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-struct WaitForMessageState {
</del><ins>+struct Connection::WaitForMessageState {
</ins><span class="cx"> WaitForMessageState(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, OptionSet<WaitForOption> waitForOptions)
</span><span class="cx"> : messageReceiverName(messageReceiverName)
</span><span class="cx"> , messageName(messageName)
</span><span class="lines">@@ -183,6 +183,26 @@
</span><span class="cx"> dispatchMessages(&connection);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Represents a sync request for which we're waiting on a reply.
+struct Connection::PendingSyncReply {
+ // The request ID.
+ uint64_t syncRequestID { 0 };
+
+ // The reply decoder, will be null if there was an error processing the sync
+ // message on the other side.
+ std::unique_ptr<Decoder> replyDecoder;
+
+ // Will be set to true once a reply has been received.
+ bool didReceiveReply { false };
+
+ PendingSyncReply() = default;
+
+ explicit PendingSyncReply(uint64_t syncRequestID)
+ : syncRequestID(syncRequestID)
+ {
+ }
+};
+
</ins><span class="cx"> Ref<Connection> Connection::createServerConnection(Identifier identifier, Client& client)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new Connection(identifier, true, client));
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (205128 => 205129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-08-29 18:26:52 UTC (rev 205128)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-08-29 18:45:56 UTC (rev 205129)
</span><span class="lines">@@ -52,8 +52,6 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-struct WaitForMessageState;
-
</del><span class="cx"> enum class SendOption {
</span><span class="cx"> // Whether this message should be dispatched when waiting for a sync reply.
</span><span class="cx"> // This is the default for synchronous messages.
</span><span class="lines">@@ -271,38 +269,14 @@
</span><span class="cx"> Condition m_waitForMessageCondition;
</span><span class="cx"> Lock m_waitForMessageMutex;
</span><span class="cx">
</span><ins>+ struct WaitForMessageState;
</ins><span class="cx"> WaitForMessageState* m_waitingForMessage;
</span><span class="cx">
</span><del>- // Represents a sync request for which we're waiting on a reply.
- struct PendingSyncReply {
- // The request ID.
- uint64_t syncRequestID;
-
- // The reply decoder, will be null if there was an error processing the sync
- // message on the other side.
- std::unique_ptr<Decoder> replyDecoder;
-
- // Will be set to true once a reply has been received.
- bool didReceiveReply;
-
- PendingSyncReply()
- : syncRequestID(0)
- , didReceiveReply(false)
- {
- }
-
- explicit PendingSyncReply(uint64_t syncRequestID)
- : syncRequestID(syncRequestID)
- , didReceiveReply(0)
- {
- }
- };
-
</del><span class="cx"> class SyncMessageState;
</span><del>- friend class SyncMessageState;
</del><span class="cx">
</span><span class="cx"> Lock m_syncReplyStateMutex;
</span><span class="cx"> bool m_shouldWaitForSyncReplies;
</span><ins>+ struct PendingSyncReply;
</ins><span class="cx"> Vector<PendingSyncReply> m_pendingSyncReplies;
</span><span class="cx">
</span><span class="cx"> Lock m_incomingSyncMessageCallbackMutex;
</span></span></pre>
</div>
</div>
</body>
</html>