summaryrefslogtreecommitdiffstats
path: root/chromium/ipc/ipc_sync_message_filter.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ipc/ipc_sync_message_filter.cc')
-rw-r--r--chromium/ipc/ipc_sync_message_filter.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/chromium/ipc/ipc_sync_message_filter.cc b/chromium/ipc/ipc_sync_message_filter.cc
index a534c445916..e2ea1bfb1ee 100644
--- a/chromium/ipc/ipc_sync_message_filter.cc
+++ b/chromium/ipc/ipc_sync_message_filter.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/waitable_event.h"
+#include "ipc/ipc_channel.h"
#include "ipc/ipc_sync_message.h"
using base::MessageLoopProxy;
@@ -16,7 +17,7 @@ using base::MessageLoopProxy;
namespace IPC {
SyncMessageFilter::SyncMessageFilter(base::WaitableEvent* shutdown_event)
- : channel_(NULL),
+ : sender_(NULL),
listener_loop_(MessageLoopProxy::current()),
shutdown_event_(shutdown_event) {
}
@@ -66,19 +67,19 @@ bool SyncMessageFilter::Send(Message* message) {
return pending_message.send_result;
}
-void SyncMessageFilter::OnFilterAdded(Channel* channel) {
- channel_ = channel;
+void SyncMessageFilter::OnFilterAdded(Sender* sender) {
+ sender_ = sender;
base::AutoLock auto_lock(lock_);
io_loop_ = MessageLoopProxy::current();
}
void SyncMessageFilter::OnChannelError() {
- channel_ = NULL;
+ sender_ = NULL;
SignalAllEvents();
}
void SyncMessageFilter::OnChannelClosing() {
- channel_ = NULL;
+ sender_ = NULL;
SignalAllEvents();
}
@@ -103,8 +104,8 @@ SyncMessageFilter::~SyncMessageFilter() {
}
void SyncMessageFilter::SendOnIOThread(Message* message) {
- if (channel_) {
- channel_->Send(message);
+ if (sender_) {
+ sender_->Send(message);
return;
}