[BrowserTag] Send dib info with NavigateGuest message,

content/browser/browser_plugin/browser_plugin_embedder.h

Index: content/browser/browser_plugin/browser_plugin_embedder.h
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h
index bad744b307e4273389a921045602cddbc07d51c2..817080deea30fab5279a15369317419bd322ed74 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.h
+++ b/content/browser/browser_plugin/browser_plugin_embedder.h
@@ -26,9 +26,10 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "ui/surface/transport_dib.h"
 
-class TransportDIB;
 class WebContentsImpl;
+struct BrowserPluginHostMsg_ResizeGuest_Params;
 
 namespace WebKit {
 class WebInputEvent;
@@ -62,11 +63,16 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver,
                                        RenderViewHost* render_view_host);
 
   // Navigates in a guest (new or existing).
-  void NavigateGuest(RenderViewHost* render_view_host,
-                     int instance_id,
-                     int64 frame_id,
-                     const std::string& src,
-                     const gfx::Size& size);
+  void NavigateGuest(
+      RenderViewHost* render_view_host,
+      int instance_id,
+      int64 frame_id,
+      const std::string& src,
+      const BrowserPluginHostMsg_ResizeGuest_Params& resize_params);
+
+  void ResizeGuest(int instance_id,
+                   const BrowserPluginHostMsg_ResizeGuest_Params& params);
+
   void Stop(int instance_id);
   void Reload(int instance_id);
 
@@ -83,15 +89,6 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver,
   // Routes update rect ack message to the appropriate guest.
   void UpdateRectACK(int instance_id, int message_id, const gfx::Size& size);
   void SetFocus(int instance_id, bool focused);
-  void ResizeGuest(int instance_id,
-                   TransportDIB* damage_buffer,
-#if defined(OS_WIN)
-                   int damage_buffer_size,
-#endif
-                   int width,
-                   int height,
-                   bool resize_pending,
-                   float scale_factor);
   // Handles input events sent from the BrowserPlugin (embedder's renderer
   // process) by passing them to appropriate guest's input handler.
   void HandleInputEvent(int instance_id,
@@ -123,6 +120,9 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver,
   void DestroyGuestByInstanceID(int instance_id);
   void DestroyGuests();
 
+  // Returns the transport DIB associated with the dib id.
+  TransportDIB* GetDamageBuffer(const TransportDIB::Id& damage_buffer_id);
+
   // Called when visiblity of web_contents changes, so the embedder will
   // show/hide its guest.
   void WebContentsVisibilityChanged(bool visible);