Apply merge from @fsamuel.

content/browser/browser_plugin/browser_plugin_guest.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.
 
 // A BrowserPluginGuest represents the browser side of browser <--> renderer
 // communication. A BrowserPlugin (a WebPlugin) is on the renderer side of
 // browser <--> guest renderer communication. The 'guest' renderer is a
 // <browser> tag.
 //
 // BrowserPluginGuest lives on the UI thread of the browser process. It has a
@@ skipping 15 matching lines @@
 // to the BrowserPlugin. BrowserPluginGuest is a WebContentsDelegate and
 // WebContentsObserver for the WebContents.
 
 #ifndef CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_
 #define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_
 
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
+#include "base/shared_memory.h"
 #include "base/time.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragStatus.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
 #include "ui/gfx/rect.h"
 #include "ui/surface/transport_dib.h"
 
@@ skipping 183 matching lines @@
   // If possible, navigate the guest to |relative_index| entries away from the
   // current navigation entry.
   virtual void Go(int relative_index);
   // Overridden in tests.
   virtual void SetFocus(bool focused);
   // Reload the guest.
   virtual void Reload();
   // Stop loading the guest.
   virtual void Stop();
   // Overridden in tests.
-  virtual void SetDamageBuffer(TransportDIB* damage_buffer,
-#if defined(OS_WIN)
-                               int damage_buffer_size,
-                               TransportDIB::Handle remote_handle,
-#endif
-                               const gfx::Size& damage_view_size,
-                               float scale_factor);
+  virtual void SetDamageBuffer(
+      const BrowserPluginHostMsg_ResizeGuest_Params& params);
+
   // Overridden in tests.
   virtual void SetCompositingBufferData(int gpu_process_id,
                                         uint32 client_id,
                                         uint32 context_id,
                                         uint32 texture_id_0,
                                         uint32 texture_id_1,
                                         uint32 sync_point);
 
   gfx::Point GetScreenCoordinates(const gfx::Point& relative_position) const;
 
  private:
   friend class TestBrowserPluginGuest;
 
   BrowserPluginGuest(int instance_id,
                      WebContentsImpl* web_contents,
                      const BrowserPluginHostMsg_CreateGuest_Params& params);
 
   // Returns the identifier that uniquely identifies a browser plugin guest
   // within an embedder.
   int instance_id() const { return instance_id_; }
-  TransportDIB* damage_buffer() const { return damage_buffer_.get(); }
+  base::SharedMemory* damage_buffer() const { return damage_buffer_.get(); }
   const gfx::Size& damage_view_size() const { return damage_view_size_; }
   float damage_buffer_scale_factor() const {
     return damage_buffer_scale_factor_;
   }
-  // Returns the transport DIB associated with the dib in resize |params|.
-  TransportDIB* GetDamageBufferFromEmbedder(
-      RenderViewHost* embedder_rvh,
+  // Returns the damage buffer corresponding to the handle in resize |params|.
+  base::SharedMemory* GetDamageBufferFromEmbedder(
       const BrowserPluginHostMsg_ResizeGuest_Params& params);
 
   // Returns the embedder's routing ID.
   int embedder_routing_id() const;
 
   // Helper to send messages to embedder. Overridden in test implementation
   // since we want to intercept certain messages for testing.
   virtual void SendMessageToEmbedder(IPC::Message* msg);
 
   // Called when a redirect notification occurs.
   void LoadRedirect(const GURL& old_url,
                     const GURL& new_url,
                     bool is_top_level);
 
   bool InAutoSizeBounds(const gfx::Size& size) const;
   // Static factory instance (always NULL for non-test).
   static content::BrowserPluginHostFactory* factory_;
 
   NotificationRegistrar notification_registrar_;
   WebContentsImpl* embedder_web_contents_;
   // An identifier that uniquely identifies a browser plugin guest within an
   // embedder.
   int instance_id_;
-  scoped_ptr<TransportDIB> damage_buffer_;
-#if defined(OS_WIN)
+  scoped_ptr<base::SharedMemory> damage_buffer_;
+  // An identifier that uniquely identifies a damage buffer.
+  uint32 damage_buffer_sequence_id_;
   size_t damage_buffer_size_;
-  TransportDIB::Handle remote_damage_buffer_handle_;
-#endif
   gfx::Size damage_view_size_;
   float damage_buffer_scale_factor_;
   gfx::Rect guest_window_rect_;
   gfx::Rect guest_screen_rect_;
   IDMap<RenderViewHost> pending_updates_;
   int pending_update_counter_;
   base::TimeDelta guest_hang_timeout_;
   bool focused_;
   bool visible_;
   bool auto_size_enabled_;
   gfx::Size max_auto_size_;
   gfx::Size min_auto_size_;
 
   // Hardware Accelerated Surface Params
   gfx::GLSurfaceHandle surface_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginGuest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_GUEST_H_