OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/plugin/plugin_channel.h" | 5 #include "chrome/plugin/plugin_channel.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/process_util.h" | 8 #include "base/process_util.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 SendUnblockingOnlyDuringDispatch(); | 41 SendUnblockingOnlyDuringDispatch(); |
42 ChildProcess::current()->AddRefProcess(); | 42 ChildProcess::current()->AddRefProcess(); |
43 const CommandLine* command_line = CommandLine::ForCurrentProcess(); | 43 const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
44 log_messages_ = command_line->HasSwitch(switches::kLogPluginMessages); | 44 log_messages_ = command_line->HasSwitch(switches::kLogPluginMessages); |
45 } | 45 } |
46 | 46 |
47 PluginChannel::~PluginChannel() { | 47 PluginChannel::~PluginChannel() { |
48 if (renderer_handle_) | 48 if (renderer_handle_) |
49 base::CloseProcessHandle(renderer_handle_); | 49 base::CloseProcessHandle(renderer_handle_); |
50 #if defined(OS_POSIX) | 50 #if defined(OS_POSIX) |
51 // If we still have the FD, close it. | 51 IPC::RemoveAndCloseChannelSocket(channel_name()); |
| 52 // If we still have the renderer FD, close it. |
52 if (renderer_fd_ != -1) { | 53 if (renderer_fd_ != -1) { |
53 close(renderer_fd_); | 54 close(renderer_fd_); |
54 } | 55 } |
55 #endif | 56 #endif |
56 ChildProcess::current()->ReleaseProcess(); | 57 ChildProcess::current()->ReleaseProcess(); |
57 } | 58 } |
58 | 59 |
59 bool PluginChannel::Send(IPC::Message* msg) { | 60 bool PluginChannel::Send(IPC::Message* msg) { |
60 in_send_++; | 61 in_send_++; |
61 if (log_messages_) { | 62 if (log_messages_) { |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 // This gets called when the PluginChannel is initially created. At this | 155 // This gets called when the PluginChannel is initially created. At this |
155 // point, create the socketpair and assign the plugin side FD to the channel | 156 // point, create the socketpair and assign the plugin side FD to the channel |
156 // name. Keep the renderer side FD as a member variable in the PluginChannel | 157 // name. Keep the renderer side FD as a member variable in the PluginChannel |
157 // to be able to transmit it through IPC. | 158 // to be able to transmit it through IPC. |
158 int plugin_fd; | 159 int plugin_fd; |
159 IPC::SocketPair(&plugin_fd, &renderer_fd_); | 160 IPC::SocketPair(&plugin_fd, &renderer_fd_); |
160 IPC::AddChannelSocket(channel_name(), plugin_fd); | 161 IPC::AddChannelSocket(channel_name(), plugin_fd); |
161 #endif | 162 #endif |
162 return PluginChannelBase::Init(ipc_message_loop, create_pipe_now); | 163 return PluginChannelBase::Init(ipc_message_loop, create_pipe_now); |
163 } | 164 } |
OLD | NEW |