Merge "Prepare ScriptController class for upstreaming."

1 files changed, 11 insertions, 0 deletions

diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index f36ecf7..995999b 100644
--- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -29,7 +29,9 @@
 #include "CookieClient.h"
 #include "JavaSharedClient.h"
 #include "KeyGeneratorClient.h"
+#include "PluginView.h"
 #include "WebViewCore.h"
+#include "npruntime.h"
 #include <wtf/android/AndroidThreading.h>
 #include <wtf/MainThread.h>
 
@@ -98,6 +100,15 @@ bool PlatformBridge::cookiesEnabled()
     return client->cookiesEnabled();
 }
 
+NPObject* PlatformBridge::pluginScriptableObject(Widget* widget)
+{
+    if (!widget->isPluginView())
+        return 0;
+
+    PluginView* pluginView = static_cast<PluginView*>(widget);
+    return pluginView->getNPObject();
+}
+
 bool PlatformBridge::isWebViewPaused()
 {
     return WebViewCore::isPaused();