Changeset 43138 in webkit for trunk/JavaScriptCore/API/APICast.h

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/APICast.h (modified) (3 diffs)

trunk/JavaScriptCore/API/APICast.h

@@ -27 +27 @@
 #define APICast_h
 
-#include "JSNumberCell.h"
 #include "JSValue.h"
-#include <wtf/Platform.h>
 
 namespace JSC {
@@ -58 +56 @@
 }
 
-inline JSC::JSValue toJS(JSC::ExecState* exec, JSValueRef v)
+inline JSC::JSValue toJS(JSValueRef v)
 {
-    JSC::JSValue jsValue = JSC::JSValue::decode(reinterpret_cast<JSC::EncodedJSValue>(const_cast<OpaqueJSValue*>(v)));
-#if !USE(ALTERNATE_JSIMMEDIATE)
-    if (jsValue && jsValue.isNumber()) {
-        ASSERT(jsValue.isAPIMangledNumber());
-        return JSC::jsNumber(exec, jsValue.uncheckedGetNumber());
-    }
-#endif
-    return jsValue;
+    return JSC::JSValue::decode(reinterpret_cast<JSC::EncodedJSValue>(const_cast<OpaqueJSValue*>(v)));
 }
 
@@ -85 +76 @@
 }
 
-inline JSValueRef toRef(JSC::ExecState* exec, JSC::JSValue v)
+inline JSValueRef toRef(JSC::JSValue v)
 {
-#if !USE(ALTERNATE_JSIMMEDIATE)
-    if (v && v.isNumber()) {
-        ASSERT(!v.isAPIMangledNumber());
-        return reinterpret_cast<JSValueRef>(JSC::JSValue::encode(JSC::jsAPIMangledNumber(exec, v.uncheckedGetNumber())));
-    }
-#endif
     return reinterpret_cast<JSValueRef>(JSC::JSValue::encode(v));
+}
+
+inline JSValueRef* toRef(JSC::JSValue* v)
+{
+    return reinterpret_cast<JSValueRef*>(v);
 }