Changeset 43138 in webkit for trunk/JavaScriptCore/API/JSCallbackFunction.cpp

Timestamp:

May 1, 2009, 9:52:36 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-05-01 Sam Weinig <​[email protected]>

Roll out JavaScriptCore API number marshaling.

• API/APICast.h: (toJS): (toRef):
• API/JSBase.cpp: (JSEvaluateScript): (JSCheckScriptSyntax):
• API/JSCallbackConstructor.cpp: (JSC::constructJSCallback):
• API/JSCallbackFunction.cpp: (JSC::JSCallbackFunction::call):
• API/JSCallbackObjectFunctions.h: (JSC::::getOwnPropertySlot): (JSC::::put): (JSC::::deleteProperty): (JSC::::construct): (JSC::::hasInstance): (JSC::::call): (JSC::::toNumber): (JSC::::toString): (JSC::::staticValueGetter): (JSC::::callbackGetter):
• API/JSObjectRef.cpp: (JSObjectMakeFunction): (JSObjectMakeArray): (JSObjectMakeDate): (JSObjectMakeError): (JSObjectMakeRegExp): (JSObjectGetPrototype): (JSObjectSetPrototype): (JSObjectGetProperty): (JSObjectSetProperty): (JSObjectGetPropertyAtIndex): (JSObjectSetPropertyAtIndex): (JSObjectDeleteProperty): (JSObjectCallAsFunction): (JSObjectCallAsConstructor):
• API/JSValueRef.cpp: (JSValueGetType): (JSValueIsUndefined): (JSValueIsNull): (JSValueIsBoolean): (JSValueIsNumber): (JSValueIsString): (JSValueIsObject): (JSValueIsObjectOfClass): (JSValueIsEqual): (JSValueIsStrictEqual): (JSValueIsInstanceOfConstructor): (JSValueMakeUndefined): (JSValueMakeNull): (JSValueMakeBoolean): (JSValueMakeNumber): (JSValueMakeString): (JSValueToBoolean): (JSValueToNumber): (JSValueToStringCopy): (JSValueToObject): (JSValueProtect): (JSValueUnprotect):
• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def:
• runtime/JSNumberCell.cpp:
• runtime/JSNumberCell.h:
• runtime/JSValue.h:

WebCore:

2009-05-01 Sam Weinig <​[email protected]>

Roll out JavaScriptCore API number marshaling.

• bindings/js/ScriptValue.cpp: (WebCore::ScriptValue::isEqual):
• inspector/JavaScriptProfile.cpp: (WebCore::getHeadCallback):
• inspector/JavaScriptProfileNode.cpp: (WebCore::getChildren): (WebCore::getParent): (WebCore::getHead):

File:

• trunk/JavaScriptCore/API/JSCallbackFunction.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSCallbackFunction.cpp

@@ -56 +56 @@
     Vector<JSValueRef, 16> arguments(argumentCount);
     for (int i = 0; i < argumentCount; i++)
-        arguments[i] = toRef(exec, args.at(i));
+        arguments[i] = toRef(args.at(i));
 
-    JSValueRef exception = 0;
-    JSValueRef result;
-    {
-        JSLock::DropAllLocks dropAllLocks(exec);
-        result = static_cast<JSCallbackFunction*>(functionObject)->m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception);
-    }
-    if (exception)
-        exec->setException(toJS(exec, exception));
-
-    return toJS(exec, result);
+    JSLock::DropAllLocks dropAllLocks(exec);
+    return toJS(static_cast<JSCallbackFunction*>(functionObject)->m_callback(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
 }