Browser Plugin: New Implementation (Browser Side)

content/renderer/browser_plugin/browser_plugin.cc

 // 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.
 
 #include "content/renderer/browser_plugin/browser_plugin.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "content/common/browser_plugin_messages.h"
 #include "content/public/common/content_client.h"
@@ skipping 36 matching lines @@
     RenderViewImpl* render_view,
     WebKit::WebFrame* frame,
     const WebPluginParams& params)
     : instance_id_(instance_id),
       render_view_(render_view),
       container_(NULL),
       damage_buffer_(NULL),
       sad_guest_(NULL),
       guest_crashed_(false),
       resize_pending_(false),
+      navigate_src_sent_(false),
       parent_frame_(frame->identifier()) {
   BrowserPluginManager::Get()->AddBrowserPlugin(instance_id, this);
   bindings_.reset(new BrowserPluginBindings(this));
 
   std::string src;
   if (ParseSrcAttribute(params, &src))
     SetSrcAttribute(src);
 }
 
 BrowserPlugin::~BrowserPlugin() {
@@ skipping 16 matching lines @@
   }
 }
 
 std::string BrowserPlugin::GetSrcAttribute() const {
   return src_;
 }
 
 void BrowserPlugin::SetSrcAttribute(const std::string& src) {
   if (src == src_ && !guest_crashed_)
     return;
-  if (!src.empty()) {
+  if (!src.empty() || navigate_src_sent_) {
     BrowserPluginManager::Get()->Send(
-        new BrowserPluginHostMsg_NavigateOrCreateGuest(
+        new BrowserPluginHostMsg_NavigateGuest(
             render_view_->GetRoutingID(),
             instance_id_,
             parent_frame_,
-            src));
+            src,
+            gfx::Size(width(), height())));
+    // Record that we sent a NavigateGuest message to embedder, once we send
+    // such message, subsequent SetSrcAttribute must always send NavigateGuest

[awong, 2012/09/06 00:23:27]

nits:
embedder, once -> embedder.  Once
such message -> such a message
SetSrcAttribute must -> SetSrcAttribute calls must

Can we add an explanation of why we must do this?

[lazyboy, 2012/09/06 04:33:53]

Done.

+    // message to the embedder even if src is empty.

[awong, 2012/09/06 00:23:27]

nit: message to -> messages to

[lazyboy, 2012/09/06 04:33:53]

Done.

+    navigate_src_sent_ = true;
   }
   src_ = src;
   guest_crashed_ = false;
 }
 
 bool BrowserPlugin::ParseSrcAttribute(
     const WebKit::WebPluginParams& params,
     std::string* src) {
   // Get the src attribute from the attributes vector
   for (unsigned i = 0; i < params.attributeNames.size(); ++i) {
@@ skipping 212 matching lines @@
     const WebRect& window_rect,
     const WebRect& clip_rect,
     const WebVector<WebRect>& cut_outs_rects,
     bool is_visible) {
   int old_width = width();
   int old_height = height();
   plugin_rect_ = window_rect;
   if (old_width == window_rect.width &&
       old_height == window_rect.height)
     return;
+  // If we didn't ever load a guest (navigate_src_sent_ = false), we ignore
+  // sending anything anything to embedder until an actual navigation (non empty

[awong, 2012/09/06 00:23:27]

nit: anything anything -> anything

Same as above, prefer describing why the behavior is needed over what the
behavior is.

[lazyboy, 2012/09/06 04:33:53]

Done.

+  // src) happens.
+  if (src_.empty() && !navigate_src_sent_)
+    return;
 
   const size_t stride = skia::PlatformCanvas::StrideForWidth(window_rect.width);
   const size_t size = window_rect.height *
                       stride *
                       GetDeviceScaleFactor() *
                       GetDeviceScaleFactor();
 
   // Don't drop the old damage buffer until after we've made sure that the
   // browser process has dropped it.
   TransportDIB* new_damage_buffer =
@@ skipping 70 matching lines @@
                                                  void* notify_data) {
 }
 
 void BrowserPlugin::didFailLoadingFrameRequest(
     const WebKit::WebURL& url,
     void* notify_data,
     const WebKit::WebURLError& error) {
 }
 
 }  // namespace content