| Index: content/common/browser_plugin_messages.h
|
| diff --git a/content/common/browser_plugin_messages.h b/content/common/browser_plugin_messages.h
|
| index 6f55729f9308e289add2ad6e710cebca996ae299..c8190f8a7c8e6ead770934f8ab5b3b5164e5c9bf 100644
|
| --- a/content/common/browser_plugin_messages.h
|
| +++ b/content/common/browser_plugin_messages.h
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/process.h"
|
| +#include "content/common/browser_plugin_info.h"
|
| #include "content/common/content_export.h"
|
| #include "content/public/common/common_param_traits.h"
|
| #include "ipc/ipc_channel_handle.h"
|
| @@ -23,6 +24,20 @@
|
| // -----------------------------------------------------------------------------
|
| // These messages are from the embedder to the browser process
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(BrowserPluginHostMsg_Surface_Params)
|
| + IPC_STRUCT_TRAITS_MEMBER(gpu_process_id)
|
| + IPC_STRUCT_TRAITS_MEMBER(client_id)
|
| + IPC_STRUCT_TRAITS_MEMBER(context_id)
|
| + IPC_STRUCT_TRAITS_MEMBER(texture_id[0])
|
| + IPC_STRUCT_TRAITS_MEMBER(texture_id[1])
|
| + IPC_STRUCT_TRAITS_MEMBER(sync_point)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| +IPC_STRUCT_BEGIN(BrowserPlugin_SwapInfo)
|
| + IPC_STRUCT_MEMBER(int, route_id)
|
| + IPC_STRUCT_MEMBER(int, gpu_host_id)
|
| +IPC_STRUCT_END()
|
| +
|
| IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_SetFocus,
|
| int /* container_instance_id */,
|
| bool /* enable */)
|
| @@ -41,10 +56,15 @@ IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_UpdateRect_ACK,
|
| // A renderer sends this to the browser process when it wants to
|
| // create a browser plugin. The browser will a guest renderer process
|
| // if necessary.
|
| -IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_NavigateFromEmbedder,
|
| +IPC_MESSAGE_ROUTED4(BrowserPluginHostMsg_NavigateFromEmbedder,
|
| int /* plugin instance id*/,
|
| long long /* frame id */,
|
| - std::string /* src */)
|
| + std::string /* src */,
|
| + BrowserPluginHostMsg_Surface_Params /* surface params */)
|
| +
|
| +IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_BuffersSwappedACK,
|
| + BrowserPlugin_SwapInfo /* info */,
|
| + uint32 /* sync_point */)
|
|
|
| // -----------------------------------------------------------------------------
|
| // These messages are from the guest renderer to the browser process
|
| @@ -108,6 +128,11 @@ IPC_MESSAGE_CONTROL2(BrowserPluginMsg_AdvanceFocus,
|
| int /* instance_id */,
|
| bool /* reverse */)
|
|
|
| +IPC_MESSAGE_CONTROL3(BrowserPluginMsg_BuffersSwapped,
|
| + int /* instance_id */,
|
| + uint64 /* surface_handle */,
|
| + BrowserPlugin_SwapInfo /* info */)
|
| +
|
| IPC_MESSAGE_CONTROL3(BrowserPluginMsg_UpdateRect,
|
| int /* instance_id */,
|
| int /* message_id */,
|
|
|