Adding RenderWidgetHostViewChildFrame for OOPIF view.

content/common/browser_plugin/browser_plugin_messages.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Multiply-included message header, no traditional include guard.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/shared_memory.h"
 #include "base/process/process.h"
 #include "base/values.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "content/common/content_export.h"
 #include "content/common/content_param_traits.h"
 #include "content/common/edit_command.h"
+#include "content/common/frame_param_macros.h"
 #include "content/public/common/browser_plugin_permission_type.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/drop_data.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "third_party/WebKit/public/web/WebDragOperation.h"
 #include "third_party/WebKit/public/web/WebDragStatus.h"
@@ skipping 50 matching lines @@
   IPC_STRUCT_MEMBER(BrowserPluginHostMsg_ResizeGuest_Params,
                     resize_guest_params)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(BrowserPluginMsg_Attach_ACK_Params)
   IPC_STRUCT_MEMBER(std::string, storage_partition_id)
   IPC_STRUCT_MEMBER(bool, persist_storage)
   IPC_STRUCT_MEMBER(std::string, name)
 IPC_STRUCT_END()
 
-IPC_STRUCT_BEGIN(BrowserPluginMsg_BuffersSwapped_Params)
-  IPC_STRUCT_MEMBER(gfx::Size, size)
-  IPC_STRUCT_MEMBER(gfx::Rect, damage_rect)
-  IPC_STRUCT_MEMBER(std::string, mailbox_name)
-  IPC_STRUCT_MEMBER(int, route_id)
-  IPC_STRUCT_MEMBER(int, host_id)
-IPC_STRUCT_END()
-
 IPC_STRUCT_BEGIN(BrowserPluginMsg_UpdateRect_Params)
   // The sequence number of the damage buffer used by the browser process.
   IPC_STRUCT_MEMBER(uint32, damage_buffer_sequence_id)
 
   // The position and size of the bitmap.
   IPC_STRUCT_MEMBER(gfx::Rect, bitmap_rect)
 
   // The scroll delta.  Only one of the delta components can be non-zero, and if
   // they are both zero, then it means there is no scrolling and the scroll_rect
   // is ignored.
@@ skipping 115 matching lines @@
 
 // A BrowserPlugin sends this to BrowserPluginEmbedder (browser process) when it
 // wants to navigate to a given src URL. If a guest WebContents already exists,
 // it will navigate that WebContents. If not, it will create the WebContents,
 // associate it with the BrowserPluginGuest, and navigate it to the requested
 // URL.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_NavigateGuest,
                     int /* instance_id*/,
                     std::string /* src */)
 
-// Acknowledge that we presented a HW buffer and provide a sync point
-// to specify the location in the command stream when the compositor
-// is no longer using it.
-IPC_MESSAGE_ROUTED5(BrowserPluginHostMsg_BuffersSwappedACK,
-                    int /* instance_id */,
-                    int /* route_id */,
-                    int /* gpu_host_id */,
-                    std::string /* mailbox_name */,
-                    uint32 /* sync_point */)
-
 IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_CopyFromCompositingSurfaceAck,
                     int /* instance_id */,
                     int /* request_id */,
                     SkBitmap);
 
-// Acknowledge that we presented an ubercomp frame.
-IPC_MESSAGE_ROUTED5(BrowserPluginHostMsg_CompositorFrameACK,
-                    int /* instance_id */,
-                    int /* route_id */,
-                    uint32 /* output_surface_id */,
-                    int /* renderer_host_id */,
-                    cc::CompositorFrameAck /* ack */)
-
 // Notify the guest renderer that some resources given to the embededer
 // are not used any more.
 IPC_MESSAGE_ROUTED5(BrowserPluginHostMsg_ReclaimCompositorResources,
                     int /* instance_id */,
                     int /* route_id */,
                     uint32 /* output_surface_id */,
                     int /* renderer_host_id */,
                     cc::CompositorFrameAck /* ack */)
 
 // When a BrowserPlugin has been removed from the embedder's DOM, it informs
@@ skipping 118 matching lines @@
 IPC_MESSAGE_ROUTED2(BrowserPluginMsg_PluginAtPositionRequest,
                     int /* request_id */,
                     gfx::Point /* position */)
 
 // Informs BrowserPlugin of a new name set for the top-level guest frame.
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_UpdatedName,
                      int /* instance_id */,
                      std::string /* name */)
 
 // Guest renders into an FBO with textures provided by the embedder.
-// When HW accelerated buffers are swapped in the guest, the message
-// is forwarded to the embedder to notify it of a new texture
-// available for compositing.
+// BrowserPlugin shares mostly the same logic as out-of-process RenderFrames but
+// because BrowserPlugins implement custom a second leverl of routing logic,

[Fady Samuel, 2013/12/19 21:35:01]

s/leverl/level

[awong, 2013/12/20 23:53:38]

Done.

+// the IPCs need to be annotated with an extra instance_id. These messages
+// provide that extra id.
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_BuffersSwapped,
                      int /* instance_id */,
-                     BrowserPluginMsg_BuffersSwapped_Params)
+                     FrameMsg_BuffersSwapped_Params /* params */)
 
-IPC_MESSAGE_CONTROL5(BrowserPluginMsg_CompositorFrameSwapped,
+IPC_MESSAGE_CONTROL2(BrowserPluginMsg_CompositorFrameSwapped,
                      int /* instance_id */,
-                     cc::CompositorFrame /* frame */,
-                     int /* route_id */,
-                     uint32 /* output_surface_id */,
-                     int /* renderer_host_id */)
+                     FrameMsg_CompositorFrameSwapped_Params /* params */)
 
 // Forwards a PointerLock Unlock request to the BrowserPlugin.
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_SetMouseLock,
                      int /* instance_id */,
                      bool /* enable */)
+
+// See comment about BrowserPluginMsg_BuffersSwapped and
+// BrowserPluginMsg_CompositorFrameSwapped for how these related
+// to the FrameHostMsg variants.
+IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_BuffersSwappedACK,
+                    int /* instance_id */,
+                    FrameHostMsg_BuffersSwappedACK_Params /* params */)
+
+// Acknowledge that we presented an ubercomp frame.
+IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_CompositorFrameSwappedACK,
+                    int /* instance_id */,
+                    FrameHostMsg_CompositorFrameSwappedACK_Params /* params */)