Changeset 20544 in webkit for trunk/JavaScriptCore/bindings/NP_jsobject.cpp

Timestamp:

Mar 27, 2007, 4:38:23 PM (18 years ago)

Author:

andersca

Message:

JavaScriptCore:

Reviewed by Geoff.

• bindings/NP_jsobject.cpp: (_NPN_InvokeDefault): Call JSObject:call for native JavaScript objects.

LayoutTests:

Reviewed by Geoff.

Add NPN_InvokeDefault test.

• plugins/netscape-invoke-default-expected.txt: Added.
• plugins/netscape-invoke-default.html: Added.

WebKitTools:

Reviewed by Geoff.

• DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c: (pluginInvoke): Add new function which takes a function and calls it using NPN_InvokeDefault.

File:

• trunk/JavaScriptCore/bindings/NP_jsobject.cpp (modified) (1 diff)

trunk/JavaScriptCore/bindings/NP_jsobject.cpp

@@ -103 +103 @@
 bool _NPN_InvokeDefault(NPP, NPObject* o, const NPVariant* args, uint32_t argCount, NPVariant* result)
 {
-    if (o->_class == NPScriptObjectClass)
-        // No notion of a default function on JS objects. Just return false, can't handle.
-        return false;
+    if (o->_class == NPScriptObjectClass) {
+        JavaScriptObject* obj = (JavaScriptObject*)o; 
+        if (!_isSafeScript(obj))
+            return false;        
+        
+        // Lookup the function object.
+        RootObject* rootObject = obj->rootObject;
+        if (!rootObject || !rootObject->isValid())
+            return false;
+        
+        ExecState* exec = rootObject->interpreter()->globalExec();
+        JSLock lock;
+        
+        // Call the function object.
+        JSObject *funcImp = static_cast<JSObject*>(obj->imp);
+        List argList = listFromVariantArgs(exec, args, argCount);
+        JSValue *resultV = funcImp->call (exec, funcImp, argList);
+        
+        // Convert and return the result of the function call.
+        convertValueToNPVariant(exec, resultV, result);
+        return true;        
+    }
+
     if (o->_class->invokeDefault)
         return o->_class->invokeDefault(o, args, argCount, result);