[BrowserTag] Send dib info with NavigateGuest message,

content/renderer/browser_plugin/browser_plugin.cc

Index: content/renderer/browser_plugin/browser_plugin.cc
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index ebcbd3ab8c797924889f28827003f22fba36afcb..09b1165eff2cd61f70554a109c648130d0a76463 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -96,13 +96,16 @@ void BrowserPlugin::SetSrcAttribute(const std::string& src) {
   if (src == src_ && !guest_crashed_)
     return;
   if (!src.empty() || navigate_src_sent_) {
+    scoped_ptr<BrowserPluginHostMsg_ResizeGuest_Params> params(
+        GetPendingResizeParams());
+    DCHECK(!params->resize_pending);
     BrowserPluginManager::Get()->Send(
         new BrowserPluginHostMsg_NavigateGuest(
             render_view_->GetRoutingID(),
             instance_id_,
             parent_frame_,
             src,
-            gfx::Size(width(), height())));
+            *params));
     // Record that we sent a NavigateGuest message to embedder. Once we send
     // such a message, subsequent SetSrcAttribute() calls must always send
     // NavigateGuest messages to the embedder (even if |src| is empty), so
@@ -362,11 +365,6 @@ void BrowserPlugin::updateGeometry(
       old_height == window_rect.height) {
     return;
   }
-  // Until an actual navigation occurs, there is no browser side embedder
-  // present to notify about geometry updates. In this case, after we've updated
-  // the BrowserPlugin's state we are done and can return immediately.
-  if (!navigate_src_sent_)
-    return;
 
   const size_t stride = skia::PlatformCanvas::StrideForWidth(window_rect.width);
   // Make sure the size of the damage buffer is at least four bytes so that we
@@ -399,26 +397,56 @@ void BrowserPlugin::updateGeometry(
   // Insert the magic word.
   *static_cast<unsigned int*>(new_damage_buffer->memory()) = 0xdeadbeef;
 
-  BrowserPluginHostMsg_ResizeGuest_Params params;
-  params.damage_buffer_id = new_damage_buffer->id();
-#if defined(OS_WIN)
-  params.damage_buffer_size = size;
-#endif
-  params.width = window_rect.width;
-  params.height = window_rect.height;
-  params.resize_pending = resize_pending_;
-  params.scale_factor = GetDeviceScaleFactor();
-  BrowserPluginManager::Get()->Send(new BrowserPluginHostMsg_ResizeGuest(
-      render_view_->GetRoutingID(),
-      instance_id_,
-      params));
-  resize_pending_ = true;
-
   if (damage_buffer_) {
     RenderProcess::current()->FreeTransportDIB(damage_buffer_);
     damage_buffer_ = NULL;
   }
   damage_buffer_ = new_damage_buffer;
+  pending_resize_params_.reset();
+
+  scoped_ptr<BrowserPluginHostMsg_ResizeGuest_Params> params(
+      new BrowserPluginHostMsg_ResizeGuest_Params);
+  params->damage_buffer_id = new_damage_buffer->id();
+#if defined(OS_WIN)
+  params->damage_buffer_size = size;
+#endif
+  params->width = window_rect.width;
+  params->height = window_rect.height;
+  params->resize_pending = resize_pending_;
+  params->scale_factor = GetDeviceScaleFactor();
+
+  if (navigate_src_sent_) {
+    BrowserPluginManager::Get()->Send(new BrowserPluginHostMsg_ResizeGuest(
+        render_view_->GetRoutingID(),
+        instance_id_,
+        *params));
+    resize_pending_ = true;
+  } else {
+    // Until an actual navigation occurs, there is no browser side embedder
+    // present to notify about geometry updates. In this case, after we've
+    // updated the BrowserPlugin's state we are done and we do not send a resize
+    // message to the browser.
+    pending_resize_params_.reset(params.release());
+  }
+}
+
+BrowserPluginHostMsg_ResizeGuest_Params*
+    BrowserPlugin::GetPendingResizeParams() {
+  if (pending_resize_params_.get()) {
+    resize_pending_ = true;
+    return pending_resize_params_.release();
+  } else {
+    BrowserPluginHostMsg_ResizeGuest_Params* params =
+        new BrowserPluginHostMsg_ResizeGuest_Params;
+
+    // We don't have a pending resize to send, so we send an invalid transport
+    // dib Id.
+    params->damage_buffer_id = TransportDIB::Id();
+    params->width = width();
+    params->height = height();
+    params->resize_pending = false;
+    return params;
+  }
 }
 
 void BrowserPlugin::updateFocus(bool focused) {