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/renderer/webplugin_delegate_proxy.h" | 5 #include "chrome/renderer/webplugin_delegate_proxy.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
10 #include <atlbase.h> | 10 #include <atlbase.h> |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 // case, don't try to connect to it, the empty name represents the host | 230 // case, don't try to connect to it, the empty name represents the host |
231 // channel, and connecting to it again does bad things. | 231 // channel, and connecting to it again does bad things. |
232 return false; | 232 return false; |
233 } | 233 } |
234 | 234 |
235 // If we received a ChannelHandle, register it now. | 235 // If we received a ChannelHandle, register it now. |
236 if (channel_handle.socket.fd >= 0) | 236 if (channel_handle.socket.fd >= 0) |
237 IPC::AddChannelSocket(channel_handle.name, channel_handle.socket.fd); | 237 IPC::AddChannelSocket(channel_handle.name, channel_handle.socket.fd); |
238 #endif | 238 #endif |
239 | 239 |
| 240 MessageLoop* ipc_message_loop = RenderThread::current()->owner_loop(); |
240 scoped_refptr<PluginChannelHost> channel_host = | 241 scoped_refptr<PluginChannelHost> channel_host = |
241 PluginChannelHost::GetPluginChannelHost( | 242 PluginChannelHost::GetPluginChannelHost(channel_handle.name, |
242 channel_handle.name, ChildProcess::current()->io_message_loop()); | 243 ipc_message_loop); |
243 if (!channel_host.get()) | 244 if (!channel_host.get()) |
244 return false; | 245 return false; |
245 | 246 |
246 int instance_id; | 247 int instance_id; |
247 bool result = channel_host->Send(new PluginMsg_CreateInstance( | 248 bool result = channel_host->Send(new PluginMsg_CreateInstance( |
248 mime_type_, &instance_id)); | 249 mime_type_, &instance_id)); |
249 if (!result) | 250 if (!result) |
250 return false; | 251 return false; |
251 | 252 |
252 plugin_path_ = plugin_path; | 253 plugin_path_ = plugin_path; |
(...skipping 757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1010 plugin_->CancelDocumentLoad(); | 1011 plugin_->CancelDocumentLoad(); |
1011 } | 1012 } |
1012 | 1013 |
1013 void WebPluginDelegateProxy::OnInitiateHTTPRangeRequest( | 1014 void WebPluginDelegateProxy::OnInitiateHTTPRangeRequest( |
1014 const std::string& url, const std::string& range_info, | 1015 const std::string& url, const std::string& range_info, |
1015 intptr_t existing_stream, bool notify_needed, intptr_t notify_data) { | 1016 intptr_t existing_stream, bool notify_needed, intptr_t notify_data) { |
1016 plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(), | 1017 plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(), |
1017 existing_stream, notify_needed, | 1018 existing_stream, notify_needed, |
1018 notify_data); | 1019 notify_data); |
1019 } | 1020 } |
OLD | NEW |