OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ppapi/proxy/proxy_channel.h" | 5 #include "ppapi/proxy/proxy_channel.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "ipc/ipc_platform_file.h" | 8 #include "ipc/ipc_platform_file.h" |
9 #include "ipc/ipc_test_sink.h" | 9 #include "ipc/ipc_test_sink.h" |
10 | 10 |
(...skipping 13 matching lines...) Expand all Loading... |
24 ProxyChannel::~ProxyChannel() { | 24 ProxyChannel::~ProxyChannel() { |
25 DVLOG(1) << "ProxyChannel::~ProxyChannel()"; | 25 DVLOG(1) << "ProxyChannel::~ProxyChannel()"; |
26 } | 26 } |
27 | 27 |
28 bool ProxyChannel::InitWithChannel(Delegate* delegate, | 28 bool ProxyChannel::InitWithChannel(Delegate* delegate, |
29 base::ProcessId peer_pid, | 29 base::ProcessId peer_pid, |
30 const IPC::ChannelHandle& channel_handle, | 30 const IPC::ChannelHandle& channel_handle, |
31 bool is_client) { | 31 bool is_client) { |
32 delegate_ = delegate; | 32 delegate_ = delegate; |
33 peer_pid_ = peer_pid; | 33 peer_pid_ = peer_pid; |
34 IPC::Channel::Mode mode = is_client ? IPC::Channel::MODE_CLIENT | 34 IPC::Channel::Mode mode = is_client |
35 : IPC::Channel::MODE_SERVER; | 35 ? IPC::Channel::MODE_CLIENT |
36 channel_.reset(new IPC::SyncChannel(channel_handle, mode, this, | 36 : IPC::Channel::MODE_SERVER; |
| 37 channel_ = IPC::SyncChannel::Create(channel_handle, mode, this, |
37 delegate->GetIPCMessageLoop(), true, | 38 delegate->GetIPCMessageLoop(), true, |
38 delegate->GetShutdownEvent())); | 39 delegate->GetShutdownEvent()); |
39 return true; | 40 return true; |
40 } | 41 } |
41 | 42 |
42 void ProxyChannel::InitWithTestSink(IPC::TestSink* test_sink) { | 43 void ProxyChannel::InitWithTestSink(IPC::TestSink* test_sink) { |
43 DCHECK(!test_sink_); | 44 DCHECK(!test_sink_); |
44 test_sink_ = test_sink; | 45 test_sink_ = test_sink; |
45 #if !defined(OS_NACL) | 46 #if !defined(OS_NACL) |
46 peer_pid_ = base::GetCurrentProcId(); | 47 peer_pid_ = base::GetCurrentProcId(); |
47 #endif | 48 #endif |
48 } | 49 } |
(...skipping 30 matching lines...) Expand all Loading... |
79 if (channel_.get()) | 80 if (channel_.get()) |
80 return channel_->Send(msg); | 81 return channel_->Send(msg); |
81 | 82 |
82 // Remote side crashed, drop this message. | 83 // Remote side crashed, drop this message. |
83 delete msg; | 84 delete msg; |
84 return false; | 85 return false; |
85 } | 86 } |
86 | 87 |
87 } // namespace proxy | 88 } // namespace proxy |
88 } // namespace ppapi | 89 } // namespace ppapi |
OLD | NEW |