JavaScriptCore:
authorggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Jun 2008 06:26:54 +0000 (06:26 +0000)
committerggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Jun 2008 06:26:54 +0000 (06:26 +0000)
2008-06-02  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Alexey Proskuryakov.

        Removed JSObject::call, since it just called JSObject::callAsFunction.

        SunSpider reports no change.

JavaScriptGlue:

2008-06-02  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Alexey Proskuryakov.

        Removed JSObject::call, since it just called JSObject::callAsFunction.

        SunSpider reports no change.

WebCore:

2008-06-02  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Alexey Proskuryakov.

        Removed JSObject::call, since it just called JSObject::callAsFunction.

        SunSpider reports no change.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@34334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

29 files changed:
JavaScriptCore/API/JSObjectRef.cpp
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.exp
JavaScriptCore/kjs/array_instance.cpp
JavaScriptCore/kjs/array_object.cpp
JavaScriptCore/kjs/function_object.cpp
JavaScriptCore/kjs/nodes.cpp
JavaScriptCore/kjs/object.cpp
JavaScriptCore/kjs/object.h
JavaScriptCore/kjs/property_slot.cpp
JavaScriptCore/kjs/string_object.cpp
JavaScriptGlue/ChangeLog
JavaScriptGlue/JSValueWrapper.cpp
JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj
WebCore/ChangeLog
WebCore/bindings/js/JSCustomSQLStatementCallback.cpp
WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp
WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp
WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp
WebCore/bindings/js/JSCustomVoidCallback.cpp
WebCore/bindings/js/JSCustomXPathNSResolver.cpp
WebCore/bindings/js/JSHTMLDocumentCustom.cpp
WebCore/bindings/js/JSNodeFilterCondition.cpp
WebCore/bindings/js/ScheduledAction.cpp
WebCore/bindings/js/kjs_events.cpp
WebCore/bindings/js/kjs_html.cpp
WebCore/bindings/objc/WebScriptObject.mm
WebCore/bridge/NP_jsobject.cpp
WebCore/bridge/jni/jni_jsobject.mm

index 739d1ff75155a9d82216bb332cc70370f295243f..77202eeccc7e73231451a49a915c48ec830ce536 100644 (file)
@@ -285,7 +285,7 @@ JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObject
     for (size_t i = 0; i < argumentCount; i++)
         argList.append(toJS(arguments[i]));
 
-    JSValueRef result = toRef(jsObject->call(exec, jsThisObject, argList)); // returns NULL if object->implementsCall() is false
+    JSValueRef result = toRef(jsObject->callAsFunction(exec, jsThisObject, argList)); // returns NULL if object->implementsCall() is false
     if (exec->hadException()) {
         if (exception)
             *exception = toRef(exec->exception());
index 27ad78caa1b5d26f27aac42acc7d386212fb37ed..f51aa98b527481420fb92c0bf850d5027b382213 100644 (file)
@@ -1,3 +1,11 @@
+2008-06-02  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Removed JSObject::call, since it just called JSObject::callAsFunction.
+
+        SunSpider reports no change.
+
 2008-06-02  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Darin Adler.
index 232b19a553a9126b23bbbd9f6dbc11819ee492c2..ca243b637beeff227b578276e4deb863d1b7b8b6 100644 (file)
@@ -198,7 +198,6 @@ __ZN3KJS8JSObject18getPrimitiveNumberEPNS_9ExecStateERdRPNS_7JSValueE
 __ZN3KJS8JSObject22fillGetterPropertySlotERNS_12PropertySlotEPPNS_7JSValueE
 __ZN3KJS8JSObject3putEPNS_9ExecStateERKNS_10IdentifierEPNS_7JSValueE
 __ZN3KJS8JSObject3putEPNS_9ExecStateEjPNS_7JSValueE
-__ZN3KJS8JSObject4callEPNS_9ExecStateEPS0_RKNS_4ListE
 __ZN3KJS8JSObject4markEv
 __ZN3KJS8JSObject9constructEPNS_9ExecStateERKNS_4ListE
 __ZN3KJS8JSObject9constructEPNS_9ExecStateERKNS_4ListERKNS_10IdentifierERKNS_7UStringEi
index e03358d950a667b502208bea4c516e3109942543..eab22cdc195f471a6253c5527d4527606bbf58ab 100644 (file)
@@ -546,7 +546,7 @@ struct AVLTreeAbstractorForArrayCompare {
         List arguments;
         arguments.append(va);
         arguments.append(vb);
-        double compareResult = m_compareFunction->call(m_exec, m_globalThisValue, arguments)->toNumber(m_exec);
+        double compareResult = m_compareFunction->callAsFunction(m_exec, m_globalThisValue, arguments)->toNumber(m_exec);
         return (compareResult < 0) ? -1 : 1; // Not passing equality through, because we need to store all values, even if equivalent.
     }
 
index 27e027e5d2717ead827da59a55dce3eb7c771a10..670d6955b2c941b6da2cec15c7df5404ee400d4e 100644 (file)
@@ -163,7 +163,7 @@ JSValue* arrayProtoFuncToLocaleString(ExecState* exec, JSObject* thisObj, const
         JSValue* conversionFunction = o->get(exec, exec->propertyNames().toLocaleString);
         UString str;
         if (conversionFunction->isObject() && static_cast<JSObject*>(conversionFunction)->implementsCall())
-            str = static_cast<JSObject*>(conversionFunction)->call(exec, o, exec->emptyList())->toString(exec);
+            str = static_cast<JSObject*>(conversionFunction)->callAsFunction(exec, o, exec->emptyList())->toString(exec);
         else
             str = element->toString(exec);
         strBuffer.append(str.data(), str.size());
@@ -409,7 +409,7 @@ JSValue* arrayProtoFuncSort(ExecState* exec, JSObject* thisObj, const List& args
                 List l;
                 l.append(jObj);
                 l.append(minObj);
-                compareResult = sortFunction->call(exec, exec->globalThisValue(), l)->toNumber(exec);
+                compareResult = sortFunction->callAsFunction(exec, exec->globalThisValue(), l)->toNumber(exec);
             } else
                 compareResult = (jObj->toString(exec) < minObj->toString(exec)) ? -1 : 1;
 
@@ -526,7 +526,7 @@ JSValue* arrayProtoFuncFilter(ExecState* exec, JSObject* thisObj, const List& ar
         eachArguments.append(jsNumber(k));
         eachArguments.append(thisObj);
 
-        JSValue* result = eachFunction->call(exec, applyThis, eachArguments);
+        JSValue* result = eachFunction->callAsFunction(exec, applyThis, eachArguments);
 
         if (result->toBoolean(exec))
             resultArray->put(exec, filterIndex++, v);
@@ -561,7 +561,7 @@ JSValue* arrayProtoFuncMap(ExecState* exec, JSObject* thisObj, const List& args)
         eachArguments.append(jsNumber(k));
         eachArguments.append(thisObj);
 
-        JSValue* result = eachFunction->call(exec, applyThis, eachArguments);
+        JSValue* result = eachFunction->callAsFunction(exec, applyThis, eachArguments);
         resultArray->put(exec, k, result);
     }
 
@@ -597,7 +597,7 @@ JSValue* arrayProtoFuncEvery(ExecState* exec, JSObject* thisObj, const List& arg
         eachArguments.append(jsNumber(k));
         eachArguments.append(thisObj);
 
-        bool predicateResult = eachFunction->call(exec, applyThis, eachArguments)->toBoolean(exec);
+        bool predicateResult = eachFunction->callAsFunction(exec, applyThis, eachArguments)->toBoolean(exec);
 
         if (!predicateResult) {
             result = jsBoolean(false);
@@ -628,7 +628,7 @@ JSValue* arrayProtoFuncForEach(ExecState* exec, JSObject* thisObj, const List& a
         eachArguments.append(jsNumber(k));
         eachArguments.append(thisObj);
 
-        eachFunction->call(exec, applyThis, eachArguments);
+        eachFunction->callAsFunction(exec, applyThis, eachArguments);
     }
     return jsUndefined();
 }
@@ -655,7 +655,7 @@ JSValue* arrayProtoFuncSome(ExecState* exec, JSObject* thisObj, const List& args
         eachArguments.append(jsNumber(k));
         eachArguments.append(thisObj);
 
-        bool predicateResult = eachFunction->call(exec, applyThis, eachArguments)->toBoolean(exec);
+        bool predicateResult = eachFunction->callAsFunction(exec, applyThis, eachArguments)->toBoolean(exec);
 
         if (predicateResult) {
             result = jsBoolean(true);
index 0830d74993c61733ae71ea6d07436332a57ae0a3..9e0b88ed30db3c70cb827fdb52008b76a9d8b792 100644 (file)
@@ -104,7 +104,7 @@ JSValue* functionProtoFuncApply(ExecState* exec, JSObject* thisObj, const List&
             return throwError(exec, TypeError);
     }
 
-    return thisObj->call(exec, applyThis, applyArgs);
+    return thisObj->callAsFunction(exec, applyThis, applyArgs);
 }
 
 JSValue* functionProtoFuncCall(ExecState* exec, JSObject* thisObj, const List& args)
@@ -122,7 +122,7 @@ JSValue* functionProtoFuncCall(ExecState* exec, JSObject* thisObj, const List& a
 
     List argsTail;
     args.getSlice(1, argsTail);
-    return thisObj->call(exec, callThis, argsTail);
+    return thisObj->callAsFunction(exec, callThis, argsTail);
 }
 
 // ------------------------------ FunctionObjectImp ----------------------------
index a651faecb7745dd11257d4b5f434d6ab0d2dd443..6bb34d95deb7c30a83e2ab7cf22689f2cd9c524d 100644 (file)
@@ -1281,7 +1281,7 @@ inline JSValue* ExpressionNode::resolveAndCall(OldInterpreterExecState* exec, co
             }
 
             JSObject* thisObj = base->toThisObject(exec);
-            return func->call(exec, thisObj, argList);
+            return func->callAsFunction(exec, thisObj, argList);
         }
         ++iter;
     } while (iter != end);
@@ -1340,7 +1340,7 @@ JSValue* FunctionCallValueNode::evaluate(OldInterpreterExecState* exec)
     KJS_CHECKEXCEPTIONVALUE
 
     JSObject* thisObj = exec->globalThisValue();
-    return func->call(exec, thisObj, argList);
+    return func->callAsFunction(exec, thisObj, argList);
 }
 
 RegisterID* FunctionCallResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
@@ -1441,7 +1441,7 @@ JSValue* LocalVarFunctionCallNode::inlineEvaluate(OldInterpreterExecState* exec)
     KJS_CHECKEXCEPTIONVALUE
 
     JSObject* thisObj = exec->globalThisValue();
-    return func->call(exec, thisObj, argList);
+    return func->callAsFunction(exec, thisObj, argList);
 }
 
 JSValue* LocalVarFunctionCallNode::evaluate(OldInterpreterExecState* exec)
@@ -1495,7 +1495,7 @@ JSValue* ScopedVarFunctionCallNode::inlineEvaluate(OldInterpreterExecState* exec
     KJS_CHECKEXCEPTIONVALUE
 
     JSObject* thisObj = exec->globalThisValue();
-    return func->call(exec, thisObj, argList);
+    return func->callAsFunction(exec, thisObj, argList);
 }
 
 JSValue* ScopedVarFunctionCallNode::evaluate(OldInterpreterExecState* exec)
@@ -1633,7 +1633,7 @@ JSValue* FunctionCallBracketNode::evaluate(OldInterpreterExecState* exec)
     ASSERT(!thisObj->isActivationObject());
 
     // No need to call toThisObject() on the thisObj as it is known not to be the GlobalObject or ActivationObject
-    return func->call(exec, thisObj, argList);
+    return func->callAsFunction(exec, thisObj, argList);
 }
 
 static const char* dotExprNotAnObjectString() KJS_FAST_CALL;
@@ -1690,7 +1690,7 @@ JSValue* FunctionCallDotNode::inlineEvaluate(OldInterpreterExecState* exec)
     ASSERT(!thisObj->isActivationObject());
 
     // No need to call toThisObject() on the thisObj as it is known not to be the GlobalObject or ActivationObject
-    return func->call(exec, thisObj, argList);
+    return func->callAsFunction(exec, thisObj, argList);
 }
 
 JSValue* FunctionCallDotNode::evaluate(OldInterpreterExecState* exec)
index b1583d2f58288f50fee810341a763a3419fbb7e2..cf714736eab84d0fc04a26e70e28e3cbc81ecdac 100644 (file)
 
 namespace KJS {
 
-// ------------------------------ Object ---------------------------------------
-
-JSValue* JSObject::call(ExecState* exec, JSObject* thisObj, const List& args)
-{
-    ASSERT(implementsCall());
-    return callAsFunction(exec, thisObj, args);
-}
-
 // ------------------------------ JSObject ------------------------------------
 
 void JSObject::mark()
@@ -158,7 +150,7 @@ void JSObject::put(ExecState* exec, const Identifier &propertyName, JSValue *val
           List args;
           args.append(value);
         
-          setterFunc->call(exec, this->toThisObject(exec), args);
+          setterFunc->callAsFunction(exec, this->toThisObject(exec), args);
           return;
         } else {
           // If there's an existing property on the object or one of its 
@@ -246,7 +238,7 @@ static ALWAYS_INLINE JSValue *tryGetAndCallProperty(ExecState *exec, const JSObj
       // spec says "not primitive type" but ...
       if (callType != CallTypeNone) {
           JSObject* thisObj = const_cast<JSObject*>(object);
-          JSValue* def = o->call(exec, thisObj->toThisObject(exec), exec->emptyList());
+          JSValue* def = o->callAsFunction(exec, thisObj->toThisObject(exec), exec->emptyList());
           JSType defType = def->type();
           ASSERT(defType != GetterSetterType);
           if (defType != ObjectType)
index 90af95363e7c462a69219425e957b7b87059d291..b8bb9b9d85ee500f1b5452189d9057250839f2fd 100644 (file)
@@ -364,8 +364,6 @@ namespace KJS {
      * @return The return value from the function
      */
     bool implementsCall();
-    JSValue *call(ExecState *exec, JSObject *thisObj, const List &args);
-
     virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
 
     /**
index 595965db59353e6f99f7659f5f6b1a7043c29cf5..11a9f310a1fe8e0ca314ed79eeb55c726875bb31 100644 (file)
@@ -46,11 +46,11 @@ JSValue *PropertySlot::functionGetter(ExecState* exec, JSObject* originalObject,
     CallData data;
     CallType callType = slot.m_data.getterFunc->getCallData(data);
     if (callType == CallTypeNative)
-        return slot.m_data.getterFunc->call(exec, originalObject, exec->emptyList());
+        return slot.m_data.getterFunc->callAsFunction(exec, originalObject, exec->emptyList());
     ASSERT(callType == CallTypeJS);
     RegisterFileStack* stack = &exec->dynamicGlobalObject()->registerFileStack();
     stack->pushFunctionRegisterFile();
-    JSValue* result = slot.m_data.getterFunc->call(exec, originalObject, exec->emptyList());
+    JSValue* result = slot.m_data.getterFunc->callAsFunction(exec, originalObject, exec->emptyList());
     stack->popFunctionRegisterFile();
     return result;    
 }
index 8a55e53484940a8faeb35dfc9dbf78b49dbb1243..e037ad6c7c6d0940c6cea20b9390a9ce325ec265 100644 (file)
@@ -350,7 +350,7 @@ static JSValue *replace(ExecState *exec, StringImp* sourceVal, JSValue *pattern,
           args.append(jsNumber(completeMatchStart));
           args.append(sourceVal);
 
-          substitutedReplacement = replacementFunction->call(exec, exec->globalThisValue(), args)->toString(exec);
+          substitutedReplacement = replacementFunction->callAsFunction(exec, exec->globalThisValue(), args)->toString(exec);
       } else
           substitutedReplacement = substituteBackreferences(replacementString, source, ovector, reg);
 
@@ -399,7 +399,7 @@ static JSValue *replace(ExecState *exec, StringImp* sourceVal, JSValue *pattern,
       args.append(jsNumber(matchPos));
       args.append(sourceVal);
       
-      replacementString = replacementFunction->call(exec, exec->globalThisValue(), args)->toString(exec);
+      replacementString = replacementFunction->callAsFunction(exec, exec->globalThisValue(), args)->toString(exec);
   }
 
   return jsString(source.substr(0, matchPos) + replacementString + source.substr(matchPos + matchLen));
index 69b1b541381eb51ca0a9e38710e23867489cf709..0311efe3c7246528f53c7613fdba9c47d53ec3c3 100644 (file)
@@ -1,3 +1,11 @@
+2008-06-02  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Removed JSObject::call, since it just called JSObject::callAsFunction.
+
+        SunSpider reports no change.
+
 2008-05-28  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Oliver Hunt.
index 4cc9a38245bad6fa57265241590bb4fd5c48e86b..3f300438cd903c56507e64e55d43f171cf321d35 100644 (file)
@@ -207,7 +207,7 @@ JSObjectRef JSValueWrapper::JSObjectCallFunction(void *data, JSObjectRef thisObj
             listArgs.append(kgsArg);
         }
 
-        JSValue *resultValue = objValue->call(exec, ksjThisObj, listArgs);
+        JSValue *resultValue = objValue->callAsFunction(exec, ksjThisObj, listArgs);
         JSValueWrapper* wrapperValue = new JSValueWrapper(resultValue);
         JSObjectCallBacks callBacks;
         GetJSObectCallBacks(callBacks);
index e0bf5d623808db18f4acb5c4cce2f6db938ea1de..cc18dc74d4d2112982a5b7765bc72e83efb0d472 100644 (file)
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 14AC662B08CE7791006915A8 /* Build configuration list for PBXProject "JavaScriptGlue" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptGlue */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
index 5e39a60db8afd589ea1051a9e13ae4204353cf2c..bb8a63b833da52db7a2db42cd7dce371fafdc97c 100644 (file)
@@ -1,3 +1,11 @@
+2008-06-02  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+        
+        Removed JSObject::call, since it just called JSObject::callAsFunction.
+        
+        SunSpider reports no change.
+
 2008-06-02  Alp Toker  <alp@nuanti.com>
 
         Reviewed by Maciej.
index 719ba135226bc360bc6970c474884051fed61dbc..a9d2cf2d3086a112aed4b0f9675cb211213aa728 100644 (file)
@@ -81,9 +81,9 @@ void JSCustomSQLStatementCallback::handleEvent(SQLTransaction* transaction, SQLR
         
     globalObject->startTimeoutCheck();
     if (handleEventFunc)
-        handleEventFunc->call(exec, m_callback, args);
+        handleEventFunc->callAsFunction(exec, m_callback, args);
     else
-        m_callback->call(exec, m_callback, args);
+        m_callback->callAsFunction(exec, m_callback, args);
     globalObject->stopTimeoutCheck();
         
     if (exec->hadException()) {
index 883fb39b586cbb1b52791b64310611a499e3e035..8fa174a37421a441bd40db842fd976c386f42dc8 100644 (file)
@@ -82,9 +82,9 @@ bool JSCustomSQLStatementErrorCallback::handleEvent(SQLTransaction* transaction,
     JSValue *result;
     globalObject->startTimeoutCheck();
     if (handleEventFunc)
-        result = handleEventFunc->call(exec, m_callback, args);
+        result = handleEventFunc->callAsFunction(exec, m_callback, args);
     else
-        result = m_callback->call(exec, m_callback, args);
+        result = m_callback->callAsFunction(exec, m_callback, args);
     globalObject->stopTimeoutCheck();
         
     if (exec->hadException()) {
index bd1b9ca37cd5f0768209d888e266a794cf87d779..7e7387947a44cb300a48dee0f5423fd02dd38050 100644 (file)
@@ -134,9 +134,9 @@ void JSCustomSQLTransactionCallback::handleEvent(SQLTransaction* transaction, bo
 
     globalObject->startTimeoutCheck();
     if (handleEventFunc)
-        handleEventFunc->call(exec, m_data->callback(), args);
+        handleEventFunc->callAsFunction(exec, m_data->callback(), args);
     else
-        m_data->callback()->call(exec, m_data->callback(), args);
+        m_data->callback()->callAsFunction(exec, m_data->callback(), args);
     globalObject->stopTimeoutCheck();
         
     if (exec->hadException()) {
index b34cfd82839013f61e86a7b24ad11b61a17d13d1..63a56a2d0a7865164e154a226775f8949ef27449 100644 (file)
@@ -80,9 +80,9 @@ bool JSCustomSQLTransactionErrorCallback::handleEvent(SQLError* error)
     JSValue *result;
     globalObject->startTimeoutCheck();
     if (handleEventFunc)
-        result = handleEventFunc->call(exec, m_callback, args);
+        result = handleEventFunc->callAsFunction(exec, m_callback, args);
     else
-        result = m_callback->call(exec, m_callback, args);
+        result = m_callback->callAsFunction(exec, m_callback, args);
     globalObject->stopTimeoutCheck();
         
     if (exec->hadException()) {
index 60326fce0b43d4390a5d71926f50e4efcadf7589..e5d23388db592e3c5ccd5dc6c5eb6043366eaf81 100644 (file)
@@ -79,9 +79,9 @@ void JSCustomVoidCallback::handleEvent()
     
     globalObject->startTimeoutCheck();
     if (handleEventFunc)
-        handleEventFunc->call(exec, m_callback, args);
+        handleEventFunc->callAsFunction(exec, m_callback, args);
     else
-        m_callback->call(exec, m_callback, args);
+        m_callback->callAsFunction(exec, m_callback, args);
     globalObject->stopTimeoutCheck();
         
     if (exec->hadException()) {
index 6adcf91c74c23b5856019a0d289f2218314cc874..a8e381d51e1ee17656b7912879eab6b330d1dc89 100644 (file)
@@ -103,9 +103,9 @@ String JSCustomXPathNSResolver::lookupNamespaceURI(const String& prefix)
     JSValue* retval;
     globalObject->startTimeoutCheck();
     if (lookupNamespaceURIFunc)
-        retval = lookupNamespaceURIFunc->call(exec, m_customResolver, args);
+        retval = lookupNamespaceURIFunc->callAsFunction(exec, m_customResolver, args);
     else
-        retval = m_customResolver->call(exec, m_customResolver, args);
+        retval = m_customResolver->callAsFunction(exec, m_customResolver, args);
     globalObject->stopTimeoutCheck();
 
     if (exec->hadException()) {
index 084338c789a0a950c32597f2991abbfcd5b757c2..d024eabc3d707c0cd02fb93aa2b310b1a95cdc84 100644 (file)
@@ -105,7 +105,7 @@ JSValue* JSHTMLDocument::open(ExecState* exec, const List& args)
                 JSObject* functionObject = wrapper->get(exec, "open")->getObject();
                 if (!functionObject || !functionObject->implementsCall())
                     return throwError(exec, TypeError);
-                return functionObject->call(exec, wrapper, args);
+                return functionObject->callAsFunction(exec, wrapper, args);
             }
         }
         return jsUndefined();
index 17884f9a3aff4c6455eae3d1bf28cc0c2d10e475..08f3334ee212ab3268e3de70eb5a299c10527c04 100644 (file)
@@ -68,7 +68,7 @@ short JSNodeFilterCondition::acceptNode(Node* filterNode, JSValue*& exception) c
         exception = takeException(exec);
         return NodeFilter::FILTER_REJECT;
     }
-    JSValue* result = m_filter->call(exec, m_filter, args);
+    JSValue* result = m_filter->callAsFunction(exec, m_filter, args);
     if (exec->hadException()) {
         exception = takeException(exec);
         return NodeFilter::FILTER_REJECT;
index 630e22b859209b38fa255ce253e151819e48e240..c58c75d201172f7a956d3756b9fefba2cc51e8c8 100644 (file)
@@ -71,7 +71,7 @@ void ScheduledAction::execute(JSDOMWindowShell* windowShell)
                 args.append(m_args[i]);
 
             window->startTimeoutCheck();
-            static_cast<JSObject*>(func)->call(exec, windowShell, args);
+            static_cast<JSObject*>(func)->callAsFunction(exec, windowShell, args);
             window->stopTimeoutCheck();
             if (exec->hadException()) {
                 JSObject* exception = exec->exception()->toObject(exec);
index eccb85cb771e67c7566f361a8bc66a311b218493..970f57bfbd5d0b22352d21fa00813f2a3573f274 100644 (file)
@@ -89,7 +89,7 @@ void JSAbstractEventListener::handleEvent(Event* ele, bool isWindowEvent)
         JSValue* retval;
         if (handleEventFunc) {
             window->startTimeoutCheck();
-            retval = handleEventFunc->call(exec, listener, args);
+            retval = handleEventFunc->callAsFunction(exec, listener, args);
         } else {
             JSObject* thisObj;
             if (isWindowEvent)
@@ -97,7 +97,7 @@ void JSAbstractEventListener::handleEvent(Event* ele, bool isWindowEvent)
             else
                 thisObj = static_cast<JSObject*>(toJS(exec, event->currentTarget()));
             window->startTimeoutCheck();
-            retval = listener->call(exec, thisObj, args);
+            retval = listener->callAsFunction(exec, thisObj, args);
         }
         window->stopTimeoutCheck();
 
index b66d0b66fe654e018ea24a96a418803dd48f136e..50054f2b23a73df2b446a695a04f5fb829e59128 100644 (file)
@@ -114,7 +114,7 @@ JSValue* runtimeObjectCallAsFunction(ExecState* exec, JSObject* thisObj, const L
     JSObject* runtimeObject = getRuntimeObject(exec, thisImp);
     if (!runtimeObject)
         return jsUndefined();
-    return runtimeObject->call(exec, thisObj, args);
+    return runtimeObject->callAsFunction(exec, thisObj, args);
 }
 
 } // namespace WebCore
index d7d77cd5f416a3ca89fbefb2ae8685919540e6c2..62cae289396c510dfad085220d622789e3626d44 100644 (file)
@@ -304,7 +304,7 @@ static void getListFromNSArray(ExecState *exec, NSArray *array, RootObject* root
         return nil;
 
     [self _rootObject]->globalObject()->startTimeoutCheck();
-    JSValue *result = funcImp->call(exec, [self _imp], argList);
+    JSValue *result = funcImp->callAsFunction(exec, [self _imp], argList);
     [self _rootObject]->globalObject()->stopTimeoutCheck();
 
     if (exec->hadException()) {
index fc69f8349ee2be1ca0f176a55bb196175c656713..f5670a803e4db1d3cb45cdd3d4f9c9a2666ad333 100644 (file)
@@ -113,7 +113,7 @@ bool _NPN_InvokeDefault(NPP, NPObject* o, const NPVariant* args, uint32_t argCou
         List argList;
         getListFromVariantArgs(exec, args, argCount, rootObject, argList);
         rootObject->globalObject()->startTimeoutCheck();
-        JSValue *resultV = funcImp->call (exec, funcImp, argList);
+        JSValue *resultV = funcImp->callAsFunction(exec, funcImp, argList);
         rootObject->globalObject()->stopTimeoutCheck();
 
         // Convert and return the result of the function call.
@@ -167,7 +167,7 @@ bool _NPN_Invoke(NPP npp, NPObject* o, NPIdentifier methodName, const NPVariant*
         List argList;
         getListFromVariantArgs(exec, args, argCount, rootObject, argList);
         rootObject->globalObject()->startTimeoutCheck();
-        JSValue *resultV = funcImp->call (exec, thisObj, argList);
+        JSValue *resultV = funcImp->callAsFunction(exec, thisObj, argList);
         rootObject->globalObject()->stopTimeoutCheck();
 
         // Convert and return the result of the function call.
index ed20aa688d642fb43602ebfef206c53b477c899a..49638fbeeadb3db0b7d44a1b0e2283d33df613d8 100644 (file)
@@ -300,7 +300,7 @@ jobject JavaJSObject::call(jstring methodName, jobjectArray args) const
     List argList;
     getListFromJArray(args, argList);
     rootObject->globalObject()->startTimeoutCheck();
-    JSValue *result = funcImp->call(exec, thisObj, argList);
+    JSValue *result = funcImp->callAsFunction(exec, thisObj, argList);
     rootObject->globalObject()->stopTimeoutCheck();
 
     return convertValueToJObject(result);