Add new CefRequestHandler::OnBeforePluginLoad callback and functions for controlling plugin loading and life span (issue #645).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@822 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef/browser/content_browser_client.cc

@@ -14,14 +14,17 @@
 #include "libcef/browser/context.h"
 #include "libcef/browser/resource_dispatcher_host_delegate.h"
 #include "libcef/browser/thread_util.h"
+#include "libcef/browser/web_plugin_impl.h"
 #include "libcef/common/cef_switches.h"
 #include "libcef/common/command_line_impl.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
+#include "content/browser/plugin_service_impl.h"
 #include "content/public/browser/access_token_store.h"
 #include "content/public/browser/media_observer.h"
+#include "content/public/browser/plugin_service_filter.h"
 #include "content/public/browser/quota_permission_context.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
@@ -161,6 +164,42 @@ class CefQuotaPermissionContext : public content::QuotaPermissionContext {
   }
 };
 
+class CefPluginServiceFilter : public content::PluginServiceFilter {
+ public:
+  CefPluginServiceFilter() {}
+  virtual ~CefPluginServiceFilter() {}
+
+  virtual bool ShouldUsePlugin(int render_process_id,
+                               int render_view_id,
+                               const void* context,
+                               const GURL& url,
+                               const GURL& policy_url,
+                               webkit::WebPluginInfo* plugin) OVERRIDE {
+    bool allowed = true;
+
+    CefRefPtr<CefBrowserHostImpl> browser =
+        CefBrowserHostImpl::GetBrowserByRoutingID(render_process_id,
+                                                  render_view_id);
+    if (browser.get()) {
+      CefRefPtr<CefClient> client = browser->GetClient();
+      if (client.get()) {
+        CefRefPtr<CefRequestHandler> handler = client->GetRequestHandler();
+        if (handler.get()) {
+          CefRefPtr<CefWebPluginInfoImpl> pluginInfo(
+              new CefWebPluginInfoImpl(*plugin));
+          allowed =
+              !handler->OnBeforePluginLoad(browser.get(),
+                                           url.possibly_invalid_spec(),
+                                           policy_url.possibly_invalid_spec(),
+                                           pluginInfo.get());
+        }
+      }
+    }
+
+    return allowed;
+  }
+};
+
 }  // namespace
 
 
@@ -192,6 +231,8 @@ class CefMediaObserver : public content::MediaObserver {
 
 CefContentBrowserClient::CefContentBrowserClient()
     : browser_main_parts_(NULL) {
+  plugin_service_filter_.reset(new CefPluginServiceFilter);
+  PluginServiceImpl::GetInstance()->SetFilter(plugin_service_filter_.get());
 }
 
 CefContentBrowserClient::~CefContentBrowserClient() {

libcef/browser/content_browser_client.h

@@ -19,6 +19,7 @@ class CefMediaObserver;
 class CefResourceDispatcherHostDelegate;
 
 namespace content {
+class PluginServiceFilter;
 class SiteInstance;
 }
 
@@ -54,6 +55,7 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
   CefBrowserMainParts* browser_main_parts_;
 
   scoped_ptr<CefMediaObserver> media_observer_;
+  scoped_ptr<content::PluginServiceFilter> plugin_service_filter_;
   scoped_ptr<CefResourceDispatcherHostDelegate>
       resource_dispatcher_host_delegate_;
 };

libcef/browser/web_plugin_impl.cc

@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef_web_plugin.h"
+#include "libcef/browser/web_plugin_impl.h"
 #include "libcef/browser/context.h"
 #include "libcef/browser/thread_util.h"
 
@@ -12,34 +12,6 @@
 
 namespace {
 
-class CefWebPluginInfoImpl : public CefWebPluginInfo {
- public:
-  explicit CefWebPluginInfoImpl(const webkit::WebPluginInfo& plugin_info)
-      : plugin_info_(plugin_info) {
-  }
-
-  virtual CefString GetName() OVERRIDE {
-    return plugin_info_.name;
-  }
-
-  virtual CefString GetPath() OVERRIDE {
-    return plugin_info_.path.value();
-  }
-
-  virtual CefString GetVersion() OVERRIDE {
-    return plugin_info_.version;
-  }
-
-  virtual CefString GetDescription() OVERRIDE {
-    return plugin_info_.desc;
-  }
-
- private:
-  webkit::WebPluginInfo plugin_info_;
-
-  IMPLEMENT_REFCOUNTING(CefWebPluginInfoImpl);
-};
-
 void PluginsCallbackImpl(
     CefRefPtr<CefWebPluginInfoVisitor> visitor,
     const std::vector<webkit::WebPluginInfo>& all_plugins) {
@@ -58,6 +30,33 @@ void PluginsCallbackImpl(
 
 }  // namespace
 
+
+// CefWebPluginInfoImpl
+
+CefWebPluginInfoImpl::CefWebPluginInfoImpl(
+    const webkit::WebPluginInfo& plugin_info)
+    : plugin_info_(plugin_info) {
+}
+
+CefString CefWebPluginInfoImpl::GetName() {
+  return plugin_info_.name;
+}
+
+CefString CefWebPluginInfoImpl::GetPath() {
+  return plugin_info_.path.value();
+}
+
+CefString CefWebPluginInfoImpl::GetVersion() {
+  return plugin_info_.version;
+}
+
+CefString CefWebPluginInfoImpl::GetDescription() {
+  return plugin_info_.desc;
+}
+
+
+// Global functions.
+
 void CefVisitWebPluginInfo(CefRefPtr<CefWebPluginInfoVisitor> visitor) {
   // Verify that the context is in a valid state.
   if (!CONTEXT_STATE_VALID()) {
@@ -65,6 +64,11 @@ void CefVisitWebPluginInfo(CefRefPtr<CefWebPluginInfoVisitor> visitor) {
     return;
   }
 
+  if (!visitor.get()) {
+    NOTREACHED() << "invalid parameter";
+    return;
+  }
+
   if (CEF_CURRENTLY_ON_UIT()) {
     PluginServiceImpl::GetInstance()->GetPlugins(
         base::Bind(PluginsCallbackImpl, visitor));
@@ -73,3 +77,141 @@ void CefVisitWebPluginInfo(CefRefPtr<CefWebPluginInfoVisitor> visitor) {
     CEF_POST_TASK(CEF_UIT, base::Bind(CefVisitWebPluginInfo, visitor));
   }
 }
+
+void CefRefreshWebPlugins() {
+  // Verify that the context is in a valid state.
+  if (!CONTEXT_STATE_VALID()) {
+    NOTREACHED() << "context not valid";
+    return;
+  }
+
+  // No thread affinity.
+  PluginServiceImpl::GetInstance()->RefreshPlugins();
+}
+
+void CefAddWebPluginPath(const CefString& path) {
+  // Verify that the context is in a valid state.
+  if (!CONTEXT_STATE_VALID()) {
+    NOTREACHED() << "context not valid";
+    return;
+  }
+
+  if (path.empty()) {
+    NOTREACHED() << "invalid parameter";
+    return;
+  }
+
+  // No thread affinity.
+  PluginServiceImpl::GetInstance()->AddExtraPluginPath(FilePath(path));
+}
+
+void CefAddWebPluginDirectory(const CefString& dir) {
+  // Verify that the context is in a valid state.
+  if (!CONTEXT_STATE_VALID()) {
+    NOTREACHED() << "context not valid";
+    return;
+  }
+
+  if (dir.empty()) {
+    NOTREACHED() << "invalid parameter";
+    return;
+  }
+
+  // No thread affinity.
+  PluginServiceImpl::GetInstance()->AddExtraPluginDir(FilePath(dir));
+}
+
+void CefRemoveWebPluginPath(const CefString& path) {
+  // Verify that the context is in a valid state.
+  if (!CONTEXT_STATE_VALID()) {
+    NOTREACHED() << "context not valid";
+    return;
+  }
+
+  if (path.empty()) {
+    NOTREACHED() << "invalid parameter";
+    return;
+  }
+
+  // No thread affinity.
+  PluginServiceImpl::GetInstance()->RemoveExtraPluginPath(FilePath(path));
+}
+
+void CefUnregisterInternalWebPlugin(const CefString& path) {
+  // Verify that the context is in a valid state.
+  if (!CONTEXT_STATE_VALID()) {
+    NOTREACHED() << "context not valid";
+    return;
+  }
+
+  if (path.empty()) {
+    NOTREACHED() << "invalid parameter";
+    return;
+  }
+
+  // No thread affinity.
+  PluginServiceImpl::GetInstance()->UnregisterInternalPlugin(FilePath(path));
+}
+
+void CefForceWebPluginShutdown(const CefString& path) {
+  // Verify that the context is in a valid state.
+  if (!CONTEXT_STATE_VALID()) {
+    NOTREACHED() << "context not valid";
+    return;
+  }
+
+  if (path.empty()) {
+    NOTREACHED() << "invalid parameter";
+    return;
+  }
+
+  if (CEF_CURRENTLY_ON_IOT()) {
+    PluginServiceImpl::GetInstance()->ForcePluginShutdown(FilePath(path));
+  } else {
+    // Execute on the IO thread.
+    CEF_POST_TASK(CEF_IOT, base::Bind(CefForceWebPluginShutdown, path));
+  }
+}
+
+void CefRegisterWebPluginCrash(const CefString& path) {
+  // Verify that the context is in a valid state.
+  if (!CONTEXT_STATE_VALID()) {
+    NOTREACHED() << "context not valid";
+    return;
+  }
+
+  if (path.empty()) {
+    NOTREACHED() << "invalid parameter";
+    return;
+  }
+
+  if (CEF_CURRENTLY_ON_IOT()) {
+    PluginServiceImpl::GetInstance()->RegisterPluginCrash(FilePath(path));
+  } else {
+    // Execute on the IO thread.
+    CEF_POST_TASK(CEF_IOT, base::Bind(CefRegisterWebPluginCrash, path));
+  }
+}
+
+void CefIsWebPluginUnstable(
+    const CefString& path,
+    CefRefPtr<CefWebPluginUnstableCallback> callback) {
+  // Verify that the context is in a valid state.
+  if (!CONTEXT_STATE_VALID()) {
+    NOTREACHED() << "context not valid";
+    return;
+  }
+
+  if (path.empty() || !callback.get()) {
+    NOTREACHED() << "invalid parameter";
+    return;
+  }
+
+  if (CEF_CURRENTLY_ON_IOT()) {
+    callback->IsUnstable(path,
+        PluginServiceImpl::GetInstance()->IsPluginUnstable(FilePath(path)));
+  } else {
+    // Execute on the IO thread.
+    CEF_POST_TASK(CEF_IOT, base::Bind(CefIsWebPluginUnstable, path, callback));
+  }
+}

libcef/browser/web_plugin_impl.h

@@ -0,0 +1,27 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+
+#ifndef CEF_LIBCEF_BROWSER_WEB_PLUGIN_IMPL_H_
+#define CEF_LIBCEF_BROWSER_WEB_PLUGIN_IMPL_H_
+#pragma once
+
+#include "include/cef_web_plugin.h"
+#include "webkit/plugins/webplugininfo.h"
+
+class CefWebPluginInfoImpl : public CefWebPluginInfo {
+ public:
+  explicit CefWebPluginInfoImpl(const webkit::WebPluginInfo& plugin_info);
+
+  virtual CefString GetName() OVERRIDE;
+  virtual CefString GetPath() OVERRIDE;
+  virtual CefString GetVersion() OVERRIDE;
+  virtual CefString GetDescription() OVERRIDE;
+
+ private:
+  webkit::WebPluginInfo plugin_info_;
+
+  IMPLEMENT_REFCOUNTING(CefWebPluginInfoImpl);
+};
+
+#endif  // CEF_LIBCEF_BROWSER_WEB_PLUGIN_IMPL_H_