Changeset 43138 in webkit for trunk/JavaScriptCore/runtime/JSNumberCell.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/runtime/JSNumberCell.h (modified) (4 diffs)

trunk/JavaScriptCore/runtime/JSNumberCell.h

@@ -53 +53 @@
         friend JSValue jsNumberCell(JSGlobalData*, double);
         friend JSValue jsNumberCell(ExecState*, double);
-        friend JSValue jsAPIMangledNumber(ExecState*, double);
     public:
         double value() const { return m_value; }
@@ -67 +66 @@
         virtual JSObject* toThisObject(ExecState*) const;
         virtual JSValue getJSNumber();
-
-        static const uintptr_t JSAPIMangledMagicNumber = 0xbbadbeef;
-        bool isAPIMangledNumber() const { return m_structure == reinterpret_cast<Structure*>(JSAPIMangledMagicNumber); }
 
         void* operator new(size_t size, ExecState* exec)
@@ -104 +100 @@
         }
 
-        enum APIMangledTag { APIMangled };
-        JSNumberCell(APIMangledTag, double value)
-            : JSCell(reinterpret_cast<Structure*>(JSAPIMangledMagicNumber))
-            , m_value(value)
-        {
-        }
-
         virtual bool getUInt32(uint32_t&) const;
         virtual bool getTruncatedInt32(int32_t&) const;
@@ -235 +224 @@
         ASSERT(isNumber());
         return JSImmediate::isImmediate(asValue()) ? JSImmediate::toDouble(asValue()) : getDoubleNumber();
-    }
-
-    JSValue jsAPIMangledNumber(ExecState* exec, double);
-
-    inline bool JSValue::isAPIMangledNumber()
-    {
-        ASSERT(isNumber());
-        return JSImmediate::isImmediate(asValue()) ? false : asNumberCell(asValue())->isAPIMangledNumber();
     }