Clean up plug-in placeholders:

chrome/renderer/plugins/blocked_plugin.cc

Index: chrome/renderer/plugins/blocked_plugin.cc
diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/plugins/blocked_plugin.cc
similarity index 59%
rename from chrome/renderer/blocked_plugin.cc
rename to chrome/renderer/plugins/blocked_plugin.cc
index 4db472a22a1555e4fccb2ba9826a44422148ba80..9ebdb531edfbfa14200237c2b16d2778416a2f86 100644
--- a/chrome/renderer/blocked_plugin.cc
+++ b/chrome/renderer/plugins/blocked_plugin.cc
@@ -2,28 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/blocked_plugin.h"
+#include "chrome/renderer/plugins/blocked_plugin.h"
 
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/plugin_uma.h"
+#include "chrome/renderer/custom_menu_commands.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebRegularExpression.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCaseSensitivity.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -33,82 +26,87 @@
 #include "webkit/plugins/npapi/webview_plugin.h"
 
 using WebKit::WebContextMenuData;
-using WebKit::WebElement;
 using WebKit::WebFrame;
 using WebKit::WebMenuItemInfo;
-using WebKit::WebNode;
 using WebKit::WebPlugin;
-using WebKit::WebPluginContainer;
 using WebKit::WebPluginParams;
 using WebKit::WebPoint;
-using WebKit::WebRegularExpression;
 using WebKit::WebString;
 using WebKit::WebURLRequest;
 using WebKit::WebVector;
 using content::RenderThread;
 
-static const char* const kBlockedPluginDataURL = "chrome://blockedplugindata/";
 // TODO(cevans) - move these to a shared header file so that there are no
 // collisions in the longer term. Currently, blocked_plugin.cc is the only
 // user of custom menu commands (extension menu items have their own range).
 static const unsigned kMenuActionLoad = 1;
 static const unsigned kMenuActionRemove = 2;
 
-static const BlockedPlugin* g_last_active_menu;
+namespace {
+const BlockedPlugin* g_last_active_menu = NULL;
+}
+
+// static
+

[battre, 2011/11/22 09:57:15]

nit: -empty line

[Bernhard Bauer, 2011/11/22 17:04:49]

gone.

+webkit::npapi::WebViewPlugin* BlockedPlugin::Create(
+    content::RenderView* render_view,
+    WebFrame* frame,
+    const WebPluginParams& params,
+    const webkit::WebPluginInfo& plugin,
+    const webkit::npapi::PluginGroup* group,
+    int template_id,
+    int message_id,
+    bool is_blocked_for_prerendering,
+    bool allow_loading) {
+  string16 name = group->GetGroupName();
+  string16 message = l10n_util::GetStringFUTF16(message_id, name);
+
+  DictionaryValue values;
+  values.SetString("message", message);
+  values.SetString("name", name);
+  values.SetString("hide", l10n_util::GetStringUTF8(IDS_PLUGIN_HIDE));
+
+  const base::StringPiece template_html(
+      ResourceBundle::GetSharedInstance().GetRawDataResource(template_id));
+
+  DCHECK(!template_html.empty()) << "unable to load template. ID: "
+                                 << template_id;
+  // "t" is the id of the templates root node.
+  std::string html_data = jstemplate_builder::GetI18nTemplateHtml(
+      template_html, &values);
+
+  BlockedPlugin* blocked_plugin = new BlockedPlugin(
+      render_view, frame, params, html_data, plugin, name,
+      is_blocked_for_prerendering, allow_loading);
+  return blocked_plugin->plugin();

[battre, 2011/11/22 09:57:15]

This looks like a memory leak.

[Bernhard Bauer, 2011/11/22 17:04:49]

BlockedPlugin is a WebViewPluginDelegate. WebViewPlugin doesn't own it's
delegate, so it notifies it instead that it is going away (via
WillDestroyPlugin), then the delegate destroys itself.  I'll add a comment
explaining that.

+}
 
 BlockedPlugin::BlockedPlugin(content::RenderView* render_view,
                              WebFrame* frame,
-                             const webkit::WebPluginInfo& info,
                              const WebPluginParams& params,
-                             const WebPreferences& preferences,
-                             int template_id,
+                             const std::string& html_data,
+                             const webkit::WebPluginInfo& info,
                              const string16& name,
-                             const string16& message,
                              bool is_blocked_for_prerendering,
                              bool allow_loading)
-    : content::RenderViewObserver(render_view),
-      frame_(frame),
+    : PluginPlaceholder(render_view, frame, params, html_data),
       plugin_info_(info),
-      plugin_params_(params),
       name_(name),
       is_blocked_for_prerendering_(is_blocked_for_prerendering),
       hidden_(false),
       allow_loading_(allow_loading) {
-  const base::StringPiece template_html(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(template_id));
-
-  DCHECK(!template_html.empty()) << "unable to load template. ID: "
-                                 << template_id;
-
-  DictionaryValue values;
-  values.SetString("message", message);
-  values.SetString("name", name_);
-  values.SetString("hide", l10n_util::GetStringUTF8(IDS_PLUGIN_HIDE));
-
-  // "t" is the id of the templates root node.
-  std::string html_data = jstemplate_builder::GetI18nTemplateHtml(
-      template_html, &values);
-
-  plugin_ = webkit::npapi::WebViewPlugin::Create(this,
-                                                 preferences,
-                                                 html_data,
-                                                 GURL(kBlockedPluginDataURL));
 }
 
 BlockedPlugin::~BlockedPlugin() {
 }
 
 void BlockedPlugin::BindWebFrame(WebFrame* frame) {
-  BindToJavascript(frame, "plugin");
+  PluginPlaceholder::BindWebFrame(frame);
   BindMethod("load", &BlockedPlugin::LoadCallback);
   BindMethod("hide", &BlockedPlugin::HideCallback);
   BindMethod("openURL", &BlockedPlugin::OpenUrlCallback);
 }
 
-void BlockedPlugin::WillDestroyPlugin() {
-  delete this;
-}
-
 void BlockedPlugin::ShowContextMenu(const WebKit::WebMouseEvent& event) {
   WebContextMenuData menu_data;
 
@@ -129,7 +127,7 @@ void BlockedPlugin::ShowContextMenu(const WebKit::WebMouseEvent& event) {
   }
 
   WebMenuItemInfo run_item;
-  run_item.action = kMenuActionLoad;
+  run_item.action = chrome::MENU_COMMAND_PLUGIN_RUN;
   // Disable this menu item if the plugin is blocked by policy.
   run_item.enabled = allow_loading_;
   run_item.label = WebString::fromUTF8(
@@ -139,7 +137,7 @@ void BlockedPlugin::ShowContextMenu(const WebKit::WebMouseEvent& event) {
   custom_items[i++] = run_item;
 
   WebMenuItemInfo hide_item;
-  hide_item.action = kMenuActionRemove;
+  hide_item.action = chrome::MENU_COMMAND_PLUGIN_HIDE;
   hide_item.enabled = true;
   hide_item.label = WebString::fromUTF8(
       l10n_util::GetStringUTF8(IDS_CONTENT_CONTEXT_PLUGIN_HIDE).c_str());
@@ -169,12 +167,19 @@ bool BlockedPlugin::OnMessageReceived(const IPC::Message& message) {
 void BlockedPlugin::ContextMenuAction(unsigned id) {
   if (g_last_active_menu != this)
     return;
-  if (id == kMenuActionLoad) {
-    RenderThread::Get()->RecordUserMetrics("Plugin_Load_Menu");
-    LoadPlugin();
-  } else if (id == kMenuActionRemove) {
-    RenderThread::Get()->RecordUserMetrics("Plugin_Hide_Menu");
-    HidePlugin();
+  switch (id) {
+    case chrome::MENU_COMMAND_PLUGIN_RUN: {
+      RenderThread::Get()->RecordUserMetrics("Plugin_Load_Menu");
+      LoadPlugin();
+      break;
+    }
+    case chrome::MENU_COMMAND_PLUGIN_HIDE: {
+      RenderThread::Get()->RecordUserMetrics("Plugin_Hide_Menu");
+      HidePlugin();
+      break;
+    }
+    default:
+      NOTREACHED();
   }
 }
 
@@ -192,28 +197,13 @@ void BlockedPlugin::OnSetIsPrerendering(bool is_prerendering) {
 }
 
 void BlockedPlugin::LoadPlugin() {
-  CHECK(plugin_);
   // This is not strictly necessary but is an important defense in case the
   // event propagation changes between "close" vs. "click-to-play".
   if (hidden_)
     return;
   if (!allow_loading_)
     return;
-  WebPluginContainer* container = plugin_->container();
-  WebPlugin* new_plugin =
-      render_view()->CreatePlugin(frame_, plugin_info_, plugin_params_);
-  if (new_plugin && new_plugin->initialize(container)) {
-    plugin_->RestoreTitleText();
-    container->setPlugin(new_plugin);
-    container->invalidate();
-    container->reportGeometry();
-    plugin_->ReplayReceivedData(new_plugin);
-    plugin_->destroy();
-  } else {
-    MissingPluginReporter::GetInstance()->ReportPluginMissing(
-        plugin_params_.mimeType.utf8(),
-        plugin_params_.url);
-  }
+  PluginPlaceholder::LoadPlugin(plugin_info_);
 }
 
 void BlockedPlugin::LoadCallback(const CppArgumentList& args,
@@ -244,56 +234,10 @@ void BlockedPlugin::OpenUrlCallback(const CppArgumentList& args,
   request.initialize();
   request.setURL(url);
   render_view()->LoadURLExternally(
-      frame_, request, WebKit::WebNavigationPolicyNewForegroundTab);
+      frame(), request, WebKit::WebNavigationPolicyNewForegroundTab);
 }
 
 void BlockedPlugin::HidePlugin() {
-  CHECK(plugin_);
   hidden_ = true;
-  WebPluginContainer* container = plugin_->container();
-  WebElement element = container->element();
-  element.setAttribute("style", "display: none;");
-  // If we have a width and height, search for a parent (often <div>) with the
-  // same dimensions. If we find such a parent, hide that as well.
-  // This makes much more uncovered page content usable (including clickable)
-  // as opposed to merely visible.
-  // TODO(cevans) -- it's a foul heurisitc but we're going to tolerate it for
-  // now for these reasons:
-  // 1) Makes the user experience better.
-  // 2) Foulness is encapsulated within this single function.
-  // 3) Confidence in no fasle positives.
-  // 4) Seems to have a good / low false negative rate at this time.
-  if (element.hasAttribute("width") && element.hasAttribute("height")) {
-    std::string width_str("width:[\\s]*");
-    width_str += element.getAttribute("width").utf8().data();
-    if (EndsWith(width_str, "px", false)) {
-      width_str = width_str.substr(0, width_str.length() - 2);
-    }
-    TrimWhitespace(width_str, TRIM_TRAILING, &width_str);
-    width_str += "[\\s]*px";
-    WebRegularExpression width_regex(WebString::fromUTF8(width_str.c_str()),
-                                     WebKit::WebTextCaseSensitive);
-    std::string height_str("height:[\\s]*");
-    height_str += element.getAttribute("height").utf8().data();
-    if (EndsWith(height_str, "px", false)) {
-      height_str = height_str.substr(0, height_str.length() - 2);
-    }
-    TrimWhitespace(height_str, TRIM_TRAILING, &height_str);
-    height_str += "[\\s]*px";
-    WebRegularExpression height_regex(WebString::fromUTF8(height_str.c_str()),
-                                      WebKit::WebTextCaseSensitive);
-    WebNode parent = element;
-    while (!parent.parentNode().isNull()) {
-      parent = parent.parentNode();
-      if (!parent.isElementNode())
-        continue;
-      element = parent.toConst<WebElement>();
-      if (element.hasAttribute("style")) {
-        WebString style_str = element.getAttribute("style");
-        if (width_regex.match(style_str) >= 0 &&
-            height_regex.match(style_str) >= 0)
-          element.setAttribute("style", "display: none;");
-      }
-    }
-  }
+  PluginPlaceholder::HidePlugin();
 }