Changeset 97381 in webkit for trunk/Source/JavaScriptGlue/UserObjectImp.cpp

Timestamp:

Oct 13, 2011, 12:24:53 PM (14 years ago)

Author:

[email protected]

Message:

De-virtualized JSCell::toNumber
​https://bugs.webkit.org/show_bug.cgi?id=69858

Reviewed by Sam Weinig.

Source/JavaScriptCore:

Removed JSCallbackObject::toNumber because its no longer necessary since
JSObject::toNumber now suffices since we implicitly add valueOf to an object's
prototype whenever a convertToType callback is provided.

• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:

De-virtualized JSCell::toNumber, JSObject::toNumber, and JSString::toNumber.

• runtime/JSCell.cpp:

(JSC::JSCell::toNumber):

• runtime/JSCell.h:
• runtime/JSObject.h:
• runtime/JSString.h:

Removed JSNotAnObject::toNumber because its result doesn't matter and it implements
defaultValue, therefore JSObject::toNumber can cover its case.

• runtime/JSNotAnObject.cpp:
• runtime/JSNotAnObject.h:

Source/JavaScriptGlue:

Removed UserObjectImp::toNumber because it's no longer necessary since
JSObject::toNumber can cover this case.

• UserObjectImp.cpp:
• UserObjectImp.h:

File:

• trunk/Source/JavaScriptGlue/UserObjectImp.cpp (modified) (1 diff)

trunk/Source/JavaScriptGlue/UserObjectImp.cpp

@@ -295 +295 @@
 }
 
-double UserObjectImp::toNumber(ExecState *exec) const
-{
-    double result = 0;
-    JSUserObject* jsObjPtr = KJSValueToJSObject(toObject(exec, exec->lexicalGlobalObject()), exec);
-    CFTypeRef cfValue = jsObjPtr ? jsObjPtr->CopyCFValue() : 0;
-    if (cfValue)
-    {
-        CFTypeID cfType = CFGetTypeID(cfValue);
-
-        if (cfValue == GetCFNull())
-        {
-            //
-        }
-        else if (cfType == CFBooleanGetTypeID())
-        {
-            if (cfValue == kCFBooleanTrue)
-            {
-                result = 1;
-            }
-        }
-        else if (cfType == CFStringGetTypeID())
-        {
-            result = CFStringGetDoubleValue((CFStringRef)cfValue);
-        }
-        else if (cfType == CFNumberGetTypeID())
-        {
-            CFNumberGetValue((CFNumberRef)cfValue, kCFNumberDoubleType, &result);
-        }
-    }
-    ReleaseCFType(cfValue);
-    if (jsObjPtr) jsObjPtr->Release();
-    return result;
-}
-
 void UserObjectImp::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {