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

Timestamp:

Oct 12, 2011, 1:23:08 PM (14 years ago)

Author:

[email protected]

Message:

De-virtualize JSCell::toString
​https://bugs.webkit.org/show_bug.cgi?id=69677

Reviewed by Sam Weinig.

Source/JavaScriptCore:

Removed toString from JSCallbackObject, since it is no
longer necessary since we now implicitly add toString and valueOf
functions to object prototypes when a convertToType callback
is provided, which is now the standard way to override toString
and valueOf in the JSC C API.

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

Removed toString from InterruptedExecutionError and
TerminatedExecutionError and replaced it with defaultValue,
which JSObject::toString calls. We'll probably have to de-virtualize
defaultValue eventually, but we'll cross that bridge when we
come to it.

• runtime/ExceptionHelpers.cpp:

(JSC::InterruptedExecutionError::defaultValue):
(JSC::TerminatedExecutionError::defaultValue):

• runtime/ExceptionHelpers.h:

Removed toString from JSNotAnObject, since its return value doesn't
actually matter and JSObject::toString can cover it.

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

De-virtualized JSCell::toString, JSObject::toString and JSString::toString.
Added handling of all cases for JSCell to JSCell::toString.

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

(JSC::JSCell::toString):

• runtime/JSCell.h:

Source/JavaScriptGlue:

Removed UserObjectImp::toString because it's no longer necessary since
clients can provide their own toString callback which will in turn be
called by JSObject::toString.

• UserObjectImp.cpp:
• UserObjectImp.h:

File:

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

trunk/Source/JavaScriptGlue/UserObjectImp.cpp

@@ -329 +329 @@
 }
 
-UString UserObjectImp::toString(ExecState *exec) const
-{
-    UString result;
-    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 = "true";
-            }
-            else
-            {
-                result = "false";
-            }
-        }
-        else if (cfType == CFStringGetTypeID())
-        {
-            result = CFStringToUString((CFStringRef)cfValue);
-        }
-        else if (cfType == CFNumberGetTypeID())
-        {
-            if (cfValue == kCFNumberNaN)
-            {
-                result = "Nan";
-            }
-            else if (CFNumberCompare(kCFNumberPositiveInfinity, (CFNumberRef)cfValue, 0) == 0)
-            {
-                result = "Infinity";
-            }
-            else if (CFNumberCompare(kCFNumberNegativeInfinity, (CFNumberRef)cfValue, 0) == 0)
-            {
-                result = "-Infinity";
-            }
-            else
-            {
-                CFStringRef cfNumStr;
-                double d = 0;
-                CFNumberGetValue((CFNumberRef)cfValue, kCFNumberDoubleType, &d);
-                if (CFNumberIsFloatType((CFNumberRef)cfValue))
-                {
-                    cfNumStr = CFStringCreateWithFormat(0, 0, CFSTR("%f"), d);
-                }
-                else
-                {
-                    cfNumStr = CFStringCreateWithFormat(0, 0, CFSTR("%.0f"), d);
-                }
-                result = CFStringToUString(cfNumStr);
-                ReleaseCFType(cfNumStr);
-            }
-        }
-        else if (cfType == CFArrayGetTypeID())
-        {
-            //
-        }
-        else if (cfType == CFDictionaryGetTypeID())
-        {
-            //
-        }
-        else if (cfType == CFSetGetTypeID())
-        {
-            //
-        }
-        else if (cfType == CFURLGetTypeID())
-        {
-            CFURLRef absURL = CFURLCopyAbsoluteURL((CFURLRef)cfValue);
-            if (absURL)
-            {
-                CFStringRef cfStr = CFURLGetString(absURL);
-                if (cfStr)
-                {
-                    result = CFStringToUString(cfStr);
-                }
-                ReleaseCFType(absURL);
-            }
-        }
-    }
-    ReleaseCFType(cfValue);
-    if (jsObjPtr) jsObjPtr->Release();
-    return result;
-}
-
 void UserObjectImp::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {