[BrowserTag] Send dib info with NavigateGuest message,

content/browser/browser_plugin/browser_plugin_embedder_helper.cc

Index: content/browser/browser_plugin/browser_plugin_embedder_helper.cc
diff --git a/content/browser/browser_plugin/browser_plugin_embedder_helper.cc b/content/browser/browser_plugin/browser_plugin_embedder_helper.cc
index 3d89c1189eb61971db3a25ec60fb35fcdcbc8df2..c6223204503b3e84a2b7906bfee5cac509fdd651 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder_helper.cc
+++ b/content/browser/browser_plugin/browser_plugin_embedder_helper.cc
@@ -53,39 +53,7 @@ bool BrowserPluginEmbedderHelper::OnMessageReceived(
 void BrowserPluginEmbedderHelper::OnResizeGuest(
     int instance_id,
     const BrowserPluginHostMsg_ResizeGuest_Params& params) {
-  TransportDIB* damage_buffer = NULL;
-#if defined(OS_WIN)
-  // On Windows we need to duplicate the handle from the remote process.
-  HANDLE section;
-  DuplicateHandle(render_view_host()->GetProcess()->GetHandle(),
-                  params.damage_buffer_id.handle,
-                  GetCurrentProcess(),
-                  &section,
-                  STANDARD_RIGHTS_REQUIRED | FILE_MAP_READ | FILE_MAP_WRITE,
-                  FALSE, 0);
-  damage_buffer = TransportDIB::Map(section);
-#elif defined(OS_MACOSX)
-  // On OSX, the browser allocates all DIBs and keeps a file descriptor around
-  // for each.
-  damage_buffer = render_view_host()->GetProcess()->
-      GetTransportDIB(params.damage_buffer_id);
-#elif defined(OS_ANDROID)
-  damage_buffer = TransportDIB::Map(params.damage_buffer_id);
-#elif defined(OS_POSIX)
-  damage_buffer = TransportDIB::Map(params.damage_buffer_id.shmkey);
-#endif  // defined(OS_POSIX)
-  DCHECK(damage_buffer);
-  // TODO(fsamuel): Schedule this later so that we don't stall the embedder for
-  // too long.
-  embedder_->ResizeGuest(instance_id,
-                         damage_buffer,
-#if defined(OS_WIN)
-                         params.damage_buffer_size,
-#endif
-                         params.width,
-                         params.height,
-                         params.resize_pending,
-                         params.scale_factor);
+  embedder_->ResizeGuest(render_view_host(), instance_id, params);
 }
 
 void BrowserPluginEmbedderHelper::OnHandleInputEvent(
@@ -128,10 +96,14 @@ void BrowserPluginEmbedderHelper::OnHandleInputEvent(
                               reply_message);
 }
 
-void BrowserPluginEmbedderHelper::OnNavigateGuest(int instance_id,
-                                                  const std::string& src,
-                                                  const gfx::Size& size) {
-  embedder_->NavigateGuest(render_view_host(), instance_id, src, size);
+void BrowserPluginEmbedderHelper::OnNavigateGuest(
+    int instance_id,
+    const std::string& src,
+    const BrowserPluginHostMsg_ResizeGuest_Params& resize_params) {
+  embedder_->NavigateGuest(render_view_host(),
+                           instance_id,
+                           src,
+                           resize_params);
 }
 
 void BrowserPluginEmbedderHelper::OnUpdateRectACK(int instance_id,