Index: ipc/ipc_sync_message_filter.h |
diff --git a/ipc/ipc_sync_message_filter.h b/ipc/ipc_sync_message_filter.h |
index 27584359ece7918f11bc62556201f2813ad70b15..dead5b329265e09f0264d055a03be148d281577a 100644 |
--- a/ipc/ipc_sync_message_filter.h |
+++ b/ipc/ipc_sync_message_filter.h |
@@ -6,14 +6,17 @@ |
#define IPC_IPC_SYNC_MESSAGE_FILTER_H_ |
#include <set> |
+#include <vector> |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_vector.h" |
+#include "base/memory/weak_ptr.h" |
#include "base/synchronization/lock.h" |
+#include "base/synchronization/waitable_event_watcher.h" |
#include "ipc/ipc_sender.h" |
#include "ipc/ipc_sync_message.h" |
#include "ipc/message_filter.h" |
+#include "ipc/mojo_event.h" |
namespace base { |
class SingleThreadTaskRunner; |
@@ -46,7 +49,10 @@ class IPC_EXPORT SyncMessageFilter : public MessageFilter, public Sender { |
~SyncMessageFilter() override; |
private: |
+ class IOMessageLoopObserver; |
+ |
friend class SyncChannel; |
+ friend class IOMessageLoopObserver; |
void set_is_channel_send_thread_safe(bool is_channel_send_thread_safe) { |
is_channel_send_thread_safe_ = is_channel_send_thread_safe; |
@@ -56,6 +62,9 @@ class IPC_EXPORT SyncMessageFilter : public MessageFilter, public Sender { |
// Signal all the pending sends as done, used in an error condition. |
void SignalAllEvents(); |
+ void OnShutdownEventSignaled(base::WaitableEvent* event); |
+ void OnIOMessageLoopDestroyed(); |
+ |
// The channel to which this filter was added. |
Sender* sender_; |
@@ -72,12 +81,24 @@ class IPC_EXPORT SyncMessageFilter : public MessageFilter, public Sender { |
PendingSyncMessages pending_sync_messages_; |
// Messages waiting to be delivered after IO initialization. |
- ScopedVector<Message> pending_messages_; |
+ std::vector<std::unique_ptr<Message>> pending_messages_; |
// Locks data members above. |
base::Lock lock_; |
- base::WaitableEvent* shutdown_event_; |
+ base::WaitableEvent* const shutdown_event_; |
+ |
+ // Used to asynchronously watch |shutdown_event_| on the IO thread and forward |
+ // to |shutdown_mojo_event_| (see below.) |
+ base::WaitableEventWatcher shutdown_watcher_; |
+ |
+ // A Mojo event which can be watched for shutdown. Signals are forwarded to |
+ // this event asynchronously from |shutdown_event_|. |
+ MojoEvent shutdown_mojo_event_; |
+ |
+ scoped_refptr<IOMessageLoopObserver> io_message_loop_observer_; |
+ |
+ base::WeakPtrFactory<SyncMessageFilter> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(SyncMessageFilter); |
}; |