diff options
author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 22:09:11 +0000 |
---|---|---|
committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 22:09:11 +0000 |
commit | f0ecb550248afddff9a28c8bf645e689f59a6e3e (patch) | |
tree | 5f5cf57c51d63213af26411488117f64e1a3b42d /content/browser/ppapi_plugin_process_host.cc | |
parent | e9dfe22b38c9f4b14dbf047e3e0816537ea632d4 (diff) | |
download | chromium_src-f0ecb550248afddff9a28c8bf645e689f59a6e3e.zip chromium_src-f0ecb550248afddff9a28c8bf645e689f59a6e3e.tar.gz chromium_src-f0ecb550248afddff9a28c8bf645e689f59a6e3e.tar.bz2 |
Broker out PPAPI handle duplication
BUG=127449
Review URL: https://chromiumcodereview.appspot.com/10378057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ppapi_plugin_process_host.cc')
-rw-r--r-- | content/browser/ppapi_plugin_process_host.cc | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index 48d019f..d774718 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -207,13 +207,12 @@ void PpapiPluginProcessHost::RequestPluginChannel(Client* client) { // We can't send any sync messages from the browser because it might lead to // a hang. See the similar code in PluginProcessHost for more description. PpapiMsg_CreateChannel* msg = new PpapiMsg_CreateChannel( - process_handle, renderer_id, client->OffTheRecord()); + renderer_id, client->OffTheRecord()); msg->set_unblock(true); if (Send(msg)) { sent_requests_.push(client); } else { - client->OnPpapiChannelOpened(base::kNullProcessHandle, - IPC::ChannelHandle(), 0); + client->OnPpapiChannelOpened(IPC::ChannelHandle(), 0); } } @@ -260,14 +259,12 @@ void PpapiPluginProcessHost::CancelRequests() { DVLOG(1) << "PpapiPluginProcessHost" << (is_broker_ ? "[broker]" : "") << "CancelRequests()"; for (size_t i = 0; i < pending_requests_.size(); i++) { - pending_requests_[i]->OnPpapiChannelOpened(base::kNullProcessHandle, - IPC::ChannelHandle(), 0); + pending_requests_[i]->OnPpapiChannelOpened(IPC::ChannelHandle(), 0); } pending_requests_.clear(); while (!sent_requests_.empty()) { - sent_requests_.front()->OnPpapiChannelOpened(base::kNullProcessHandle, - IPC::ChannelHandle(), 0); + sent_requests_.front()->OnPpapiChannelOpened(IPC::ChannelHandle(), 0); sent_requests_.pop(); } } @@ -283,22 +280,5 @@ void PpapiPluginProcessHost::OnRendererPluginChannelCreated( Client* client = sent_requests_.front(); sent_requests_.pop(); - // Prepare the handle to send to the renderer. - base::ProcessHandle plugin_process = process_->GetHandle(); -#if defined(OS_WIN) - base::ProcessHandle renderer_process; - int renderer_id; - client->GetPpapiChannelInfo(&renderer_process, &renderer_id); - - base::ProcessHandle renderers_plugin_handle = NULL; - ::DuplicateHandle(::GetCurrentProcess(), plugin_process, - renderer_process, &renderers_plugin_handle, - 0, FALSE, DUPLICATE_SAME_ACCESS); -#elif defined(OS_POSIX) - // Don't need to duplicate anything on POSIX since it's just a PID. - base::ProcessHandle renderers_plugin_handle = plugin_process; -#endif - - client->OnPpapiChannelOpened(renderers_plugin_handle, channel_handle, - process_->GetData().id); + client->OnPpapiChannelOpened(channel_handle, process_->GetData().id); } |