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/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));
+  }
+}