| Index: ppapi/nacl_irt/plugin_startup.h
|
| diff --git a/ppapi/nacl_irt/plugin_startup.h b/ppapi/nacl_irt/plugin_startup.h
|
| index 2684a78316bc821e670bb6d2f9d926b17b1efb1f..06ce229de4571e19199f0f0d03ac28f0657bfc48 100644
|
| --- a/ppapi/nacl_irt/plugin_startup.h
|
| +++ b/ppapi/nacl_irt/plugin_startup.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef PPAPI_NACL_IRT_PLUGIN_STARTUP_H_
|
| #define PPAPI_NACL_IRT_PLUGIN_STARTUP_H_
|
|
|
| +#include "ipc/ipc_channel_handle.h"
|
| #include "ppapi/proxy/ppapi_proxy_export.h"
|
|
|
| namespace base {
|
| @@ -16,22 +17,24 @@ namespace ppapi {
|
|
|
| class ManifestService;
|
|
|
| -// Sets the IPC channels for the browser and the renderer by the given FD
|
| -// numbers. This will be used for non-SFI mode. Must be called before the
|
| +// Sets the IPC channels for the browser and the renderer.
|
| +// This will be used for non-SFI mode. Must be called before the
|
| // ppapi_start() IRT interface is called.
|
| -PPAPI_PROXY_EXPORT void SetIPCFileDescriptors(
|
| - int browser_ipc_fd, int renderer_ipc_fd, int manifest_service_fd);
|
| +PPAPI_PROXY_EXPORT void SetIPCChannelHandles(
|
| + IPC::ChannelHandle browser_ipc_handle,
|
| + IPC::ChannelHandle renderer_ipc_handle,
|
| + IPC::ChannelHandle manifest_service_handle);
|
|
|
| // Runs start up procedure for the plugin.
|
| // Specifically, start background IO thread for IPC, and prepare
|
| // shutdown event instance.
|
| PPAPI_PROXY_EXPORT void StartUpPlugin();
|
|
|
| -// Returns IPC file descriptor for PPAPI to the browser.
|
| -int GetBrowserIPCFileDescriptor();
|
| +// Returns IPC channel handle for PPAPI to the browser.
|
| +IPC::ChannelHandle GetBrowserIPCChannelHandle();
|
|
|
| -// Returns IPC file descriptor for PPAPI to the renderer.
|
| -int GetRendererIPCFileDescriptor();
|
| +// Returns IPC channel handle for PPAPI to the renderer.
|
| +IPC::ChannelHandle GetRendererIPCChannelHandle();
|
|
|
| // Returns the shutdown event instance for the plugin.
|
| // Must be called after StartUpPlugin().
|
| @@ -40,8 +43,8 @@ base::WaitableEvent* GetShutdownEvent();
|
| // Returns the IOThread for the plugin. Must be called after StartUpPlugin().
|
| base::Thread* GetIOThread();
|
|
|
| -// Returns the ManifestService interface. To use this, manifest_service_fd
|
| -// needs to be set via SetIPCFileDescriptors. Must be called after
|
| +// Returns the ManifestService interface. To use this, manifest_service_handle
|
| +// needs to be set via SetIPCChannelHandles. Must be called after
|
| // StartUpPlugin().
|
| // If not available, returns NULL.
|
| ManifestService* GetManifestService();
|
|
|