Chromium Code Reviews| Index: content/common/browser_plugin_messages.h |
| diff --git a/content/common/browser_plugin_messages.h b/content/common/browser_plugin_messages.h |
| index af68c719d6f67cc4962608390f8a259df2eeccd9..67d6b40ba0e7920103fdda2c9ad1331be529781a 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" |
| @@ -27,6 +28,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_TRAITS_BEGIN(BrowserPlugin_SwapInfo) |
| + IPC_STRUCT_TRAITS_MEMBER(route_id) |
| + IPC_STRUCT_TRAITS_MEMBER(gpu_host_id) |
| +IPC_STRUCT_TRAITS_END() |
| + |
| // Tells the guest to focus or defocus itself. |
| IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_SetFocus, |
| int /* instance_id */, |
| @@ -54,10 +69,15 @@ IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_UpdateRect_ACK, |
| // that WebContents. If not, it will create the WebContents, associate it with |
| // the BrowserPlugin's browser-side BrowserPluginHost as a guest, and navigate |
| // it to the requested URL. |
| -IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_NavigateOrCreateGuest, |
| +IPC_MESSAGE_ROUTED4(BrowserPluginHostMsg_NavigateOrCreateGuest, |
| int /* instance_id*/, |
| long long /* frame_id */, |
| - std::string /* src */) |
| + std::string /* src */, |
| + BrowserPluginHostMsg_Surface_Params /* surface params */) |
|
scshunt
2012/08/12 01:42:45
Do we need to send surface parameters with every g
scshunt
2012/08/17 17:30:28
A: Yes we do, since we want a new surface for cros
|
| + |
| +IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_BuffersSwappedACK, |
| + BrowserPlugin_SwapInfo /* info */, |
| + uint32 /* sync_point */) |
| // When a BrowserPlugin has been removed from the embedder's DOM, it informs |
| // the browser process to cleanup the guest. |
| @@ -136,6 +156,9 @@ IPC_STRUCT_BEGIN(BrowserPluginMsg_UpdateRect_Params) |
| // Is this UpdateRect an ACK to a resize request? |
| IPC_STRUCT_MEMBER(bool, is_resize_ack) |
| + |
| + // Do we need to reply to it |
| + IPC_STRUCT_MEMBER(bool, needs_ack) |
| IPC_STRUCT_END() |
| // When the user tabs to the end of the tab stops of a guest, the browser |
| @@ -144,6 +167,15 @@ 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_CONTROL2(BrowserPluginMsg_SurfaceResize, |
| + int /* instance_id */, |
| + gfx::Size /* size */) |
| + |
| // The guest has damage it wants to convey to the embedder so that it can |
| // update its backing store. |
| IPC_MESSAGE_CONTROL3(BrowserPluginMsg_UpdateRect, |