Adding MimeHandlerView.

content/renderer/browser_plugin/browser_plugin.cc

 // Copyright 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/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/browser_plugin/browser_plugin_constants.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/renderer/browser_plugin_delegate.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/browser_plugin/browser_plugin_bindings.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/child_frame_compositing_helper.h"
 #include "content/renderer/cursor_utils.h"
 #include "content/renderer/drop_data_builder.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/sad_plugin.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
@@ skipping 11 matching lines @@
 using blink::WebPluginParams;
 using blink::WebPoint;
 using blink::WebRect;
 using blink::WebURL;
 using blink::WebVector;
 
 namespace content {
 
 BrowserPlugin::BrowserPlugin(RenderViewImpl* render_view,
                              blink::WebFrame* frame,
-                             bool auto_navigate)
+                             BrowserPluginDelegate* delegate)
     : attached_(false),
       attach_pending_(false),
       render_view_(render_view->AsWeakPtr()),
       render_view_routing_id_(render_view->GetRoutingID()),
       container_(NULL),
       paint_ack_received_(true),
       last_device_scale_factor_(GetDeviceScaleFactor()),
       sad_guest_(NULL),
       guest_crashed_(false),
       content_window_routing_id_(MSG_ROUTING_NONE),
       plugin_focused_(false),
       visible_(true),
-      auto_navigate_(auto_navigate),
       mouse_locked_(false),
       browser_plugin_manager_(render_view->GetBrowserPluginManager()),
       browser_plugin_instance_id_(browser_plugin::kInstanceIDNone),
+      delegate_(delegate),
       weak_ptr_factory_(this) {
 }
 
 BrowserPlugin::~BrowserPlugin() {
   browser_plugin_manager()->RemoveBrowserPlugin(browser_plugin_instance_id_);
 
   if (!ready())
     return;
 
   browser_plugin_manager()->Send(
@@ skipping 316 matching lines @@
   npp_.reset(new NPP_t);
   container->allowScriptObjects();
 
   bindings_.reset(new BrowserPluginBindings(this));
   container_ = container;
   container_->setWantsWheelEvents(true);
 
   // This is a way to notify observers of our attributes that this plugin is
   // available in render tree.
   browser_plugin_instance_id_ = browser_plugin_manager()->GetNextInstanceID();
+
+  if (delegate_)
+    delegate_->SetElementInstanceID(browser_plugin_instance_id_);

[Fady Samuel, 2014/09/02 15:08:25]

Given that we make use of the element instance ID in ChromeBrowserPluginDelegate
and we don't have guards against invalid IDs in ChromeBrowserPluginDelegate, I
worry that the code might be racy or might introduce races in the future.


I see two solutions:

1. Add guards for using element_instance_id in ChromeBrowserPluginDelegate OR
2. Allocate the element instance ID in the constructor instead of on initialize.

I would prefer 2. In other words: Move the three lines above into the
constructor.

[lazyboy, 2014/09/02 20:17:22]

Done #2.

+
   UpdateDOMAttribute("internalinstanceid",

[Fady Samuel, 2014/09/02 15:08:25]

You don't have to do this in this CL but it occurs to me that if we have a
delegate, we might not need this anymore. Perhaps the delegate can fire an
extension event that informs web_view.js (and other GuestView custom elements)
of the BrowserPlugin's unique ID.

Perhaps a TODO about how maybe we don't need this DOM attribute and instead we
can carry the element ID to the content embedder through the delegate.

[lazyboy, 2014/09/02 20:17:22]

Added TODO.

                      base::IntToString(browser_plugin_instance_id_));
 
   browser_plugin_manager()->AddBrowserPlugin(browser_plugin_instance_id_, this);
   return true;
 }
 
 void BrowserPlugin::EnableCompositing(bool enable) {
   bool enabled = !!compositing_helper_.get();
   if (enabled == enable)
     return;
@@ skipping 281 matching lines @@
         mask,
         position));
   return true;
 }
 
 void BrowserPlugin::didReceiveResponse(
     const blink::WebURLResponse& response) {
 }
 
 void BrowserPlugin::didReceiveData(const char* data, int data_length) {
-  if (auto_navigate_) {
-    std::string value(data, data_length);
-    html_string_ += value;
-  }
+  if (delegate_)
+    delegate_->DidReceiveData(data, data_length);
 }
 
 void BrowserPlugin::didFinishLoading() {
-  if (auto_navigate_) {
-    // TODO(lazyboy): Make |auto_navigate_| stuff work.
-    UpdateDOMAttribute(content::browser_plugin::kAttributeSrc, html_string_);
-  }
+  if (delegate_)
+    delegate_->DidFinishLoading();
 }
 
 void BrowserPlugin::didFailLoading(const blink::WebURLError& error) {
 }
 
 void BrowserPlugin::didFinishLoadingFrameRequest(const blink::WebURL& url,
                                                  void* notify_data) {
 }
 
 void BrowserPlugin::didFailLoadingFrameRequest(
@@ skipping 86 matching lines @@
     const blink::WebMouseEvent& event) {
   browser_plugin_manager()->Send(
       new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
                                                 browser_plugin_instance_id_,
                                                 plugin_rect_,
                                                 &event));
   return true;
 }
 
 }  // namespace content