summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_sync_message_filter.cc
diff options
context:
space:
mode:
authormorrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-13 06:07:14 +0000
committermorrita@chromium.org <morrita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-13 06:07:14 +0000
commitd1549b8de5f07af6de2e1e58d3e6ce8ec6754f60 (patch)
tree78246b8aa9134c47dda365f11e822e6c2e6d69cf /ipc/ipc_sync_message_filter.cc
parent12a63dac960d6714b9d6d863117ac4d734f283d4 (diff)
downloadchromium_src-d1549b8de5f07af6de2e1e58d3e6ce8ec6754f60.zip
chromium_src-d1549b8de5f07af6de2e1e58d3e6ce8ec6754f60.tar.gz
chromium_src-d1549b8de5f07af6de2e1e58d3e6ce8ec6754f60.tar.bz2
Decouple IPC::MessageFilter from IPC::Channel
This change gets rid of Channel dependency from MessageFilter so that it depends only on IPC::Sender. TEST=none BUG=377980 R=jam@chromium.org, darin@chromium.org Review URL: https://codereview.chromium.org/324143002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_sync_message_filter.cc')
-rw-r--r--ipc/ipc_sync_message_filter.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/ipc/ipc_sync_message_filter.cc b/ipc/ipc_sync_message_filter.cc
index 3833d2b..e2ea1bf 100644
--- a/ipc/ipc_sync_message_filter.cc
+++ b/ipc/ipc_sync_message_filter.cc
@@ -17,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) {
}
@@ -67,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();
}
@@ -104,8 +104,8 @@ SyncMessageFilter::~SyncMessageFilter() {
}
void SyncMessageFilter::SendOnIOThread(Message* message) {
- if (channel_) {
- channel_->Send(message);
+ if (sender_) {
+ sender_->Send(message);
return;
}