Apply merge from @fsamuel.

content/renderer/browser_plugin/browser_plugin.h

Index: content/renderer/browser_plugin/browser_plugin.h
===================================================================
--- content/renderer/browser_plugin/browser_plugin.h	(revision 182101)
+++ content/renderer/browser_plugin/browser_plugin.h	(working copy)
@@ -199,16 +199,16 @@
   void TriggerEvent(const std::string& event_name,
                     std::map<std::string, base::Value*>* props);
 
-  // Creates and maps transport dib. Overridden in tests.
-  virtual TransportDIB* CreateTransportDIB(const size_t size);
-  // Frees up the damage buffer. Overridden in tests.
-  virtual void FreeDamageBuffer(TransportDIB** damage_buffer);
+  // Creates and maps a shared damage buffer.
+  virtual base::SharedMemory* CreateDamageBuffer(
+      const size_t size,
+      base::SharedMemoryHandle* shared_memory_handle);
   // Swaps out the |current_damage_buffer_| with the |pending_damage_buffer_|.
   void SwapDamageBuffers();
 
   // Populates BrowserPluginHostMsg_ResizeGuest_Params with resize state and
-  // returns the newly allocated TransportDIB.
-  TransportDIB* PopulateResizeGuestParameters(
+  // allocates a new |pending_damage_buffer_| if in software rendering mode.
+  void PopulateResizeGuestParameters(
       BrowserPluginHostMsg_ResizeGuest_Params* params,
       const gfx::Size& view_size);
 
@@ -218,7 +218,7 @@
 
   // Populates both AutoSize and ResizeGuest parameters based on the current
   // autosize state.
-  TransportDIB* GetDamageBufferWithSizeParams(
+  void GetDamageBufferWithSizeParams(
       BrowserPluginHostMsg_AutoSize_Params* auto_size_params,
       BrowserPluginHostMsg_ResizeGuest_Params* resize_guest_params);
 
@@ -228,15 +228,16 @@
   // Informs the BrowserPlugin that guest has changed its size in autosize mode.
   void SizeChangedDueToAutoSize(const gfx::Size& old_view_size);
 
-#if defined(OS_MACOSX)
-  bool DamageBufferMatches(const TransportDIB* damage_buffer,
-                           const TransportDIB::Id& other_damage_buffer_id);
-#else
-  bool DamageBufferMatches(
-      const TransportDIB* damage_buffer,
-      const TransportDIB::Handle& other_damage_buffer_handle);
-#endif
+  // Indicates whether a damage buffer was used by the guest process for the
+  // provided |params|.
+  static bool UsesDamageBuffer(
+      const BrowserPluginMsg_UpdateRect_Params& params);
 
+  // Indicates whether the |pending_damage_buffer_| was used to copy over pixels
+  // given the provided |params|.
+  bool UsesPendingDamageBuffer(
+      const BrowserPluginMsg_UpdateRect_Params& params);
+
   // IPC message handlers.
   // Please keep in alphabetical order.
   void OnAdvanceFocus(int instance_id, bool reverse);
@@ -272,8 +273,9 @@
   WebKit::WebPluginContainer* container_;
   scoped_ptr<BrowserPluginBindings> bindings_;
   scoped_ptr<BrowserPluginBackingStore> backing_store_;
-  TransportDIB* current_damage_buffer_;
-  TransportDIB* pending_damage_buffer_;
+  scoped_ptr<base::SharedMemory> current_damage_buffer_;
+  scoped_ptr<base::SharedMemory> pending_damage_buffer_;
+  uint32 damage_buffer_sequence_id_;
   gfx::Rect plugin_rect_;
   // Bitmap for crashed plugin. Lazily initialized, non-owning pointer.
   SkBitmap* sad_guest_;