Browser Plugin: Simplify BrowserPluginGuestHelper

content/common/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/process.h"
@@ skipping 158 matching lines @@
 // Sends an input event to the guest.
 IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_HandleInputEvent,
                     int /* instance_id */,
                     gfx::Rect /* guest_window_rect */,
                     IPC::WebInputEventPointer /* event */)
 
 // An ACK to the guest process letting it know that the embedder has handled
 // the previous frame and is ready for the next frame. If the guest sent the
 // embedder a bitmap that does not match the size of the BrowserPlugin's
 // container, the BrowserPlugin requests a new size as well.
-IPC_MESSAGE_ROUTED4(BrowserPluginHostMsg_UpdateRect_ACK,
+IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_UpdateRect_ACK,
     int /* instance_id */,
-    int /* message_id */,
     BrowserPluginHostMsg_AutoSize_Params /* auto_size_params */,
     BrowserPluginHostMsg_ResizeGuest_Params /* resize_guest_params */)
 
 // 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*/,
@@ skipping 119 matching lines @@
                     int /* instance_id */,
                     bool /* accept */)
 
 // Inform the embedder of the cursor the guest wishes to display.
 IPC_MESSAGE_ROUTED2(BrowserPluginMsg_SetCursor,
                     int /* instance_id */,
                     WebCursor /* cursor */)
 
 // The guest has damage it wants to convey to the embedder so that it can
 // update its backing store.
-IPC_MESSAGE_ROUTED3(BrowserPluginMsg_UpdateRect,
+IPC_MESSAGE_ROUTED2(BrowserPluginMsg_UpdateRect,
                     int /* instance_id */,
-                    int /* message_id */,
                     BrowserPluginMsg_UpdateRect_Params)
 
 // Requests the renderer to find out if a browser plugin is at position
 // (|x|, |y|) within the embedder.
 // The response message is BrowserPluginHostMsg_PluginAtPositionResponse.
 // The |request_id| uniquely identifies a request from an embedder.
 IPC_MESSAGE_ROUTED2(BrowserPluginMsg_PluginAtPositionRequest,
                     int /* request_id */,
                     gfx::Point /* position */)
 
 // 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.
 IPC_MESSAGE_ROUTED5(BrowserPluginMsg_BuffersSwapped,
                     int /* instance_id */,
                     gfx::Size /* size */,
                     uint64 /* surface_handle */,
                     int /* route_id */,
                     int /* gpu_host_id */)
 
 // HW accelerated surface was created in the guest, forward this
 // information to the embedder to update rendering parameters
 // in the compositor.
 IPC_MESSAGE_ROUTED3(BrowserPluginMsg_AcceleratedSurfaceNew,
                     int /* instance_id */,
                     uint64 /* surface_handle */,
                     std::string /* mailbox_name */)