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

Timestamp:

May 3, 2009, 12:56:13 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

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

Roll JSC API number marshaling back out. It still breaks windows.

WebCore:

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

Roll JSC API number marshaling back out. It still breaks windows.

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);
 }