Title: [205129] trunk/Source/WebKit2
- Revision
- 205129
- Author
- ander...@apple.com
- Date
- 2016-08-29 11:45:56 -0700 (Mon, 29 Aug 2016)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (205128 => 205129)
--- 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)
@@ -1,3 +1,15 @@
+2016-08-29 Anders Carlsson <ander...@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.
+
2016-08-26 Anders Carlsson <ander...@apple.com>
Remove sync message sending from secondary threads
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (205128 => 205129)
--- 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)
@@ -36,7 +36,7 @@
namespace IPC {
-struct WaitForMessageState {
+struct Connection::WaitForMessageState {
WaitForMessageState(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, OptionSet<WaitForOption> waitForOptions)
: messageReceiverName(messageReceiverName)
, messageName(messageName)
@@ -183,6 +183,26 @@
dispatchMessages(&connection);
}
+// 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)
+ {
+ }
+};
+
Ref<Connection> Connection::createServerConnection(Identifier identifier, Client& client)
{
return adoptRef(*new Connection(identifier, true, client));
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (205128 => 205129)
--- 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)
@@ -52,8 +52,6 @@
namespace IPC {
-struct WaitForMessageState;
-
enum class SendOption {
// Whether this message should be dispatched when waiting for a sync reply.
// This is the default for synchronous messages.
@@ -271,38 +269,14 @@
Condition m_waitForMessageCondition;
Lock m_waitForMessageMutex;
+ struct WaitForMessageState;
WaitForMessageState* m_waitingForMessage;
- // 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)
- {
- }
- };
-
class SyncMessageState;
- friend class SyncMessageState;
Lock m_syncReplyStateMutex;
bool m_shouldWaitForSyncReplies;
+ struct PendingSyncReply;
Vector<PendingSyncReply> m_pendingSyncReplies;
Lock m_incomingSyncMessageCallbackMutex;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
