Index: content/renderer/pepper/pepper_plugin_delegate_impl.cc |
=================================================================== |
--- content/renderer/pepper/pepper_plugin_delegate_impl.cc (revision 213146) |
+++ content/renderer/pepper/pepper_plugin_delegate_impl.cc (working copy) |
@@ -429,24 +429,6 @@ |
return module; |
} |
-RendererPpapiHost* PepperPluginDelegateImpl::CreateExternalPluginModule( |
- scoped_refptr<webkit::ppapi::PluginModule> module, |
- const base::FilePath& path, |
- ppapi::PpapiPermissions permissions, |
- const IPC::ChannelHandle& channel_handle, |
- base::ProcessId peer_pid, |
- int plugin_child_id) { |
- // We don't call PepperPluginRegistry::AddLiveModule, as this module is |
- // managed externally. |
- return CreateOutOfProcessModule(module.get(), |
- path, |
- permissions, |
- channel_handle, |
- peer_pid, |
- plugin_child_id, |
- true); // is_external = true |
-} |
- |
scoped_refptr<PepperBrokerImpl> PepperPluginDelegateImpl::CreateBroker( |
webkit::ppapi::PluginModule* plugin_module) { |
DCHECK(plugin_module); |
@@ -1362,6 +1344,24 @@ |
} |
} |
+RendererPpapiHost* PepperPluginDelegateImpl::CreateExternalPluginModule( |
+ scoped_refptr<webkit::ppapi::PluginModule> module, |
+ const base::FilePath& path, |
+ ppapi::PpapiPermissions permissions, |
+ const IPC::ChannelHandle& channel_handle, |
+ base::ProcessId peer_pid, |
+ int plugin_child_id) { |
+ // We don't call PepperPluginRegistry::AddLiveModule, as this module is |
+ // managed externally. |
+ return CreateOutOfProcessModule(module.get(), |
+ path, |
+ permissions, |
+ channel_handle, |
+ peer_pid, |
+ plugin_child_id, |
+ true); // is_external = true |
+} |
+ |
base::SharedMemory* PepperPluginDelegateImpl::CreateAnonymousSharedMemory( |
size_t size) { |
return RenderThread::Get()->HostAllocateSharedMemoryBuffer(size).release(); |