Apply merge from @fsamuel.

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"
+#include "base/shared_memory.h"
 #include "content/common/content_export.h"
 #include "content/common/content_param_traits.h"
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragStatus.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webdropdata.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
 #define IPC_MESSAGE_START BrowserPluginMsgStart
 
 IPC_ENUM_TRAITS(WebKit::WebDragStatus)
 
 IPC_STRUCT_BEGIN(BrowserPluginHostMsg_AutoSize_Params)
   IPC_STRUCT_MEMBER(bool, enable)
   IPC_STRUCT_MEMBER(gfx::Size, max_size)
   IPC_STRUCT_MEMBER(gfx::Size, min_size)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(BrowserPluginHostMsg_ResizeGuest_Params)
-  // An identifier to the new buffer to use to transport damage to the embedder
-  // renderer process.
-  IPC_STRUCT_MEMBER(TransportDIB::Id, damage_buffer_id)
-#if defined(OS_MACOSX)
-  // On OSX, a handle to the new buffer is used to map the transport dib since
-  // we don't let browser manage the dib.
-  IPC_STRUCT_MEMBER(TransportDIB::Handle, damage_buffer_handle)
-#endif
-#if defined(OS_WIN)
-  // The size of the damage buffer because this information is not available
-  // on Windows.
-  IPC_STRUCT_MEMBER(int, damage_buffer_size)
-#endif
+  // The sequence number used to uniquely identify the damage buffer for the
+  // current container size.
+  IPC_STRUCT_MEMBER(uint32, damage_buffer_sequence_id)
+  // The handle to use to map the damage buffer in the browser process.
+  IPC_STRUCT_MEMBER(base::SharedMemoryHandle, damage_buffer_handle)
+  // The size of the damage buffer.
+  IPC_STRUCT_MEMBER(size_t, damage_buffer_size)
   // The new size of the guest view area.
   IPC_STRUCT_MEMBER(gfx::Size, view_size)
   // Indicates the scale factor of the embedder WebView.
   IPC_STRUCT_MEMBER(float, scale_factor)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(BrowserPluginHostMsg_CreateGuest_Params)
   IPC_STRUCT_MEMBER(std::string, storage_partition_id)
   IPC_STRUCT_MEMBER(bool, persist_storage)
   IPC_STRUCT_MEMBER(bool, focused)
@@ skipping 18 matching lines @@
   // Chrome's process ID for the guest.
   IPC_STRUCT_MEMBER(int, process_id)
   // The index of the current navigation entry after this navigation was
   // committed.
   IPC_STRUCT_MEMBER(int, current_entry_index)
   // The number of navigation entries after this navigation was committed.
   IPC_STRUCT_MEMBER(int, entry_count)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(BrowserPluginMsg_UpdateRect_Params)
-  // The bitmap to be painted into the view at the locations specified by
-  // update_rects.
-#if defined(OS_MACOSX)
-  IPC_STRUCT_MEMBER(TransportDIB::Id, damage_buffer_identifier)
-#else
-  IPC_STRUCT_MEMBER(TransportDIB::Handle, damage_buffer_identifier)
-#endif
+  // 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.
   IPC_STRUCT_MEMBER(gfx::Vector2d, scroll_delta)
 
   // The rectangular region to scroll.
@@ skipping 244 matching lines @@
                     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_ROUTED2(BrowserPluginMsg_AcceleratedSurfaceNew,
                     int /* instance_id */,
                     gfx::Size /* size */)