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 "content/renderer/pepper/pepper_plugin_delegate_impl.h" | 5 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 #include <cstddef> | 8 #include <cstddef> |
9 #include <map> | 9 #include <map> |
10 #include <queue> | 10 #include <queue> |
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 } | 403 } |
404 | 404 |
405 RendererPpapiHost* PepperPluginDelegateImpl::CreateExternalPluginModule( | 405 RendererPpapiHost* PepperPluginDelegateImpl::CreateExternalPluginModule( |
406 scoped_refptr<webkit::ppapi::PluginModule> module, | 406 scoped_refptr<webkit::ppapi::PluginModule> module, |
407 const FilePath& path, | 407 const FilePath& path, |
408 ppapi::PpapiPermissions permissions, | 408 ppapi::PpapiPermissions permissions, |
409 const IPC::ChannelHandle& channel_handle, | 409 const IPC::ChannelHandle& channel_handle, |
410 int plugin_child_id) { | 410 int plugin_child_id) { |
411 // We don't call PepperPluginRegistry::AddLiveModule, as this module is | 411 // We don't call PepperPluginRegistry::AddLiveModule, as this module is |
412 // managed externally. | 412 // managed externally. |
| 413 // TODO(bbudge) pass plugin_child_id when PpapiPluginProcessHost receives |
| 414 // a message notifying it that the external plugin process has been created. |
413 return CreateOutOfProcessModule( | 415 return CreateOutOfProcessModule( |
414 module, path, permissions, channel_handle, plugin_child_id); | 416 module, path, permissions, channel_handle, 0); |
415 } | 417 } |
416 | 418 |
417 scoped_refptr<webkit::ppapi::PluginModule> | 419 scoped_refptr<webkit::ppapi::PluginModule> |
418 PepperPluginDelegateImpl::CreateBrowserPluginModule( | 420 PepperPluginDelegateImpl::CreateBrowserPluginModule( |
419 const IPC::ChannelHandle& channel_handle, | 421 const IPC::ChannelHandle& channel_handle, |
420 int guest_process_id) { | 422 int guest_process_id) { |
421 old::BrowserPluginRegistry* registry = | 423 old::BrowserPluginRegistry* registry = |
422 RenderThreadImpl::current()->browser_plugin_registry(); | 424 RenderThreadImpl::current()->browser_plugin_registry(); |
423 scoped_refptr<webkit::ppapi::PluginModule> module = | 425 scoped_refptr<webkit::ppapi::PluginModule> module = |
424 registry->GetModule(guest_process_id); | 426 registry->GetModule(guest_process_id); |
(...skipping 1468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1893 return render_view_->mouse_lock_dispatcher(); | 1895 return render_view_->mouse_lock_dispatcher(); |
1894 } | 1896 } |
1895 } | 1897 } |
1896 | 1898 |
1897 webkit_glue::ClipboardClient* | 1899 webkit_glue::ClipboardClient* |
1898 PepperPluginDelegateImpl::CreateClipboardClient() const { | 1900 PepperPluginDelegateImpl::CreateClipboardClient() const { |
1899 return new RendererClipboardClient; | 1901 return new RendererClipboardClient; |
1900 } | 1902 } |
1901 | 1903 |
1902 } // namespace content | 1904 } // namespace content |
OLD | NEW |