Changeset 64377 in webkit

Timestamp:

Jul 30, 2010 2:43:48 PM (14 years ago)

Author:

andersca@apple.com

Message:

Implement NPN_Evaluate
​https://bugs.webkit.org/show_bug.cgi?id=43268

Reviewed by Sam Weinig.

WebKit2:

• WebProcess/Plugins/NPRuntimeObjectMap.cpp:

(WebKit::NPRuntimeObjectMap::evaluate):
Evaluate the passed in string.

• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:

(WebKit::NPN_Evaluate):
Call NetscapePlugin::evaluate.

• WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::evaluate):
Call PluginController::evaluate.

• WebProcess/Plugins/PluginController.h:

Add evaluate pure virtual member function.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::evaluate):
Update the popup window state and call NPRuntimeObjectMap::evaluate.

LayoutTests:

Add test.

• plugins/npruntime/evaluate-expected.txt: Added.
• plugins/npruntime/evaluate.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/plugins/npruntime/evaluate-expected.txt (added)
• LayoutTests/plugins/npruntime/evaluate.html (added)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/NPJSObject.cpp (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp (modified) (3 diffs)
• WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (modified) (3 diffs)
• WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (1 diff)
• WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginController.h (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-30  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Implement NPN_Evaluate
+        https://bugs.webkit.org/show_bug.cgi?id=43268
+
+        Add test.
+
+        * plugins/npruntime/evaluate-expected.txt: Added.
+        * plugins/npruntime/evaluate.html: Added.
+
 2010-07-30  Satish Sampath  <satish@chromium.org>
 

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-30  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Implement NPN_Evaluate
+        https://bugs.webkit.org/show_bug.cgi?id=43268
+
+        * WebProcess/Plugins/NPRuntimeObjectMap.cpp:
+        (WebKit::NPRuntimeObjectMap::evaluate):
+        Evaluate the passed in string.
+
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::NPN_Evaluate):
+        Call NetscapePlugin::evaluate.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::evaluate):
+        Call PluginController::evaluate.
+
+        * WebProcess/Plugins/PluginController.h:
+        Add evaluate pure virtual member function.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::evaluate):
+        Update the popup window state and call NPRuntimeObjectMap::evaluate.
+
 2010-07-30  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/WebProcess/Plugins/NPJSObject.cpp

@@ -120 +120 @@
 }
 
-bool NPJSObject::invokeDefault(const NPVariant *arguments, uint32_t argumentCount, NPVariant *result)
+bool NPJSObject::invokeDefault(const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
 {
     ExecState* exec = m_objectMap->globalExec();
@@ -216 +216 @@
 }
 
-bool NPJSObject::construct(const NPVariant *arguments, uint32_t argumentCount, NPVariant *result)
+bool NPJSObject::construct(const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
 {
     ExecState* exec = m_objectMap->globalExec();

trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp

@@ -26 +26 @@
 #include "NPRuntimeObjectMap.h"
 
-#include <JavaScriptCore/JSLock.h>
-
 #include "JSNPObject.h"
 #include "NPJSObject.h"
@@ -33 +31 @@
 #include "NotImplemented.h"
 #include "PluginView.h"
+#include <JavaScriptCore/JSLock.h>
+#include <JavaScriptCore/SourceCode.h>
 #include <WebCore/Frame.h>
 
@@ -169 +169 @@
 }
 
+bool NPRuntimeObjectMap::evaluate(NPObject* npObject, const String&scriptString, NPVariant* result)
+{
+    ProtectedPtr<JSGlobalObject> globalObject = this->globalObject();
+    if (!globalObject)
+        return false;
+
+    ExecState* exec = globalObject->globalExec();
+    
+    JSLock lock(SilenceAssertionsOnly);
+    JSValue thisValue = getOrCreateJSObject(globalObject, npObject);
+
+    globalObject->globalData()->timeoutChecker.start();
+    Completion completion = JSC::evaluate(exec, globalObject->globalScopeChain(), makeSource(UString(scriptString.impl())), thisValue);
+    globalObject->globalData()->timeoutChecker.stop();
+
+    ComplType completionType = completion.complType();
+
+    JSValue resultValue;
+    if (completionType == Normal) {
+        resultValue = completion.value();
+        if (!resultValue)
+            resultValue = jsUndefined();
+    } else
+        resultValue = jsUndefined();
+
+    exec->clearException();
+    
+    convertJSValueToNPVariant(exec, resultValue, *result);
+    return true;
+}
+
 void NPRuntimeObjectMap::invalidate()
 {

trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h

@@ -39 +39 @@
 }
 
+namespace WebCore {
+    class String;
+}
+
 namespace WebKit {
 
@@ -53 +57 @@
     // retain it and return it.
     NPObject* getOrCreateNPObject(JSC::JSObject*);
-
     void npJSObjectDestroyed(NPJSObject*);
 
     // Returns a JSObject object that wraps the given NPObject.
     JSC::JSObject* getOrCreateJSObject(JSC::JSGlobalObject*, NPObject*);
-
     void jsNPObjectDestroyed(JSNPObject*);
 
     void convertJSValueToNPVariant(JSC::ExecState*, JSC::JSValue, NPVariant&);
     JSC::JSValue convertNPVariantToJSValue(JSC::ExecState*, JSC::JSGlobalObject*, const NPVariant&);
+
+    bool evaluate(NPObject*, const WebCore::String&scriptString, NPVariant* result);
 
     // Called when the plug-in is destroyed. Will invalidate all the NPObjects.

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp

@@ -551 +551 @@
 }
 
-static bool NPN_Invoke(NPP, NPObject *npObject, NPIdentifier methodName, const NPVariant *arguments, uint32_t argumentCount, NPVariant *result)
+static bool NPN_Invoke(NPP, NPObject *npObject, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
 {
     if (npObject->_class->invoke)
@@ -559 +559 @@
 }
 
-static bool NPN_InvokeDefault(NPP, NPObject *npObject, const NPVariant *arguments, uint32_t argumentCount, NPVariant *result)
+static bool NPN_InvokeDefault(NPP, NPObject *npObject, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
 {
     if (npObject->_class->invokeDefault)
@@ -567 +567 @@
 }
 
-static bool NPN_Evaluate(NPP npp, NPObject *npobj, NPString *script, NPVariant *result)
-{
-    notImplemented();
-    return false;
+static bool NPN_Evaluate(NPP npp, NPObject *npObject, NPString *script, NPVariant* result)
+{
+    RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
+    String scriptString = String::fromUTF8WithLatin1Fallback(script->UTF8Characters, script->UTF8Length);
+    
+    return plugin->evaluate(npObject, scriptString, result);
 }
 

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -149 +149 @@
 }
 
+bool NetscapePlugin::evaluate(NPObject* npObject, const String& scriptString, NPVariant* result)
+{
+    return m_pluginController->evaluate(npObject, scriptString, result, allowPopups());
+}
+
 NPObject* NetscapePlugin::windowScriptNPObject()
 {

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

@@ -61 +61 @@
     NPError destroyStream(NPStream*, NPReason);
     void setStatusbarText(const WebCore::String&);
+    bool evaluate(NPObject*, const WebCore::String&scriptString, NPVariant* result);
 
     // These return retained objects.

trunk/WebKit2/WebProcess/Plugins/PluginController.h

@@ -28 +28 @@
 
 struct NPObject;
+typedef struct _NPVariant NPVariant;
 
 namespace WebCore {
@@ -65 +66 @@
     virtual NPObject* pluginElementNPObject() = 0;
 
+    // Evaluates the given script string in the context of the given NPObject.
+    virtual bool evaluate(NPObject*, const WebCore::String&scriptString, NPVariant* result, bool allowPopups) = 0;
+
     // Set the statusbar text.
     virtual void setStatusbarText(const WebCore::String&) = 0;

trunk/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -637 +637 @@
 }
 
+bool PluginView::evaluate(NPObject* npObject, const String&scriptString, NPVariant* result, bool allowPopups)
+{
+    if (!frame())
+        return false;
+
+    bool oldAllowPopups = frame()->script()->allowPopupsFromPlugin();
+    frame()->script()->setAllowPopupsFromPlugin(allowPopups);
+
+    // FIXME: What happens if calling evaluate will cause the plug-in view to go away.
+    bool returnValue = m_npRuntimeObjectMap.evaluate(npObject, scriptString, result);
+
+    frame()->script()->setAllowPopupsFromPlugin(oldAllowPopups);
+
+    return returnValue;
+}
+
 void PluginView::setStatusbarText(const String& statusbarText)
 {

trunk/WebKit2/WebProcess/Plugins/PluginView.h

@@ -104 +104 @@
     virtual NPObject* windowScriptNPObject();
     virtual NPObject* pluginElementNPObject();
+    virtual bool evaluate(NPObject*, const WebCore::String&scriptString, NPVariant* result, bool allowPopups);
     virtual void setStatusbarText(const WebCore::String&);