Changeset 96627 in webkit

Timestamp:

Oct 4, 2011 12:02:03 PM (13 years ago)

Author:

mhahnenberg@apple.com

Message:

Implicitly add toString and valueOf to prototype when convertToType callback is provided
​https://bugs.webkit.org/show_bug.cgi?id=69156

Reviewed by Geoffrey Garen.

Added callbacks for toString and valueOf which are implicitly added to a client object's
prototype if they provide a convertToType callback when declaring their class through
the JSC API.

• API/JSCallbackFunction.cpp:

(JSC::JSCallbackFunction::toStringCallback):
(JSC::JSCallbackFunction::valueOfCallback):

• API/JSCallbackFunction.h:
• API/JSClassRef.cpp:

(OpaqueJSClass::prototype):

• API/tests/testapi.js:

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSCallbackFunction.cpp (modified) (2 diffs)
• API/JSCallbackFunction.h (modified) (1 diff)
• API/JSClassRef.cpp (modified) (1 diff)
• API/tests/testapi.js (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSCallbackFunction.cpp

@@ -31 +31 @@
 #include "CodeBlock.h"
 #include "ExceptionHelpers.h"
+#include "JSCallbackObject.h"
 #include "JSFunction.h"
 #include "FunctionPrototype.h"
@@ -89 +90 @@
 }
 
+JSValueRef JSCallbackFunction::toStringCallback(JSContextRef ctx, JSObjectRef, JSObjectRef thisObject, size_t, const JSValueRef[], JSValueRef* exception)
+{
+    JSObject* object = toJS(thisObject);
+    if (object->inherits(&JSCallbackObject<JSNonFinalObject>::s_info))
+        return static_cast<JSCallbackObject<JSNonFinalObject>*>(object)->classRef()->convertToType(ctx, thisObject, kJSTypeString, exception);
+    if (object->inherits(&JSCallbackObject<JSGlobalObject>::s_info))
+        return static_cast<JSCallbackObject<JSGlobalObject>*>(object)->classRef()->convertToType(ctx, thisObject, kJSTypeString, exception);
+    return 0;
+}
+
+JSValueRef JSCallbackFunction::valueOfCallback(JSContextRef ctx, JSObjectRef, JSObjectRef thisObject, size_t, const JSValueRef[], JSValueRef* exception)
+{
+    JSObject* object = toJS(thisObject);
+    if (object->inherits(&JSCallbackObject<JSNonFinalObject>::s_info))
+        return static_cast<JSCallbackObject<JSNonFinalObject>*>(object)->classRef()->convertToType(ctx, thisObject, kJSTypeNumber, exception);
+    if (object->inherits(&JSCallbackObject<JSGlobalObject>::s_info))
+        return static_cast<JSCallbackObject<JSGlobalObject>*>(object)->classRef()->convertToType(ctx, thisObject, kJSTypeNumber, exception);
+    return 0;
+}
+
+
 } // namespace JSC

trunk/Source/JavaScriptCore/API/JSCallbackFunction.h

@@ -56 +56 @@
     }
 
+    static JSValueRef toStringCallback(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+    static JSValueRef valueOfCallback(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+
 private:
     virtual CallType getCallDataVirtual(CallData&);

trunk/Source/JavaScriptCore/API/JSClassRef.cpp

@@ -244 +244 @@
      *  DerivedClass  |  DerivedClassPrototype
      */
-    
+
+    if (convertToType) {
+        if (!prototypeClass)
+            prototypeClass = OpaqueJSClass::create(&kJSClassDefinitionEmpty).leakRef();
+        if (!prototypeClass->m_staticFunctions)
+            prototypeClass->m_staticFunctions = new OpaqueJSClassStaticFunctionsTable;
+        const Identifier& toString = exec->propertyNames().toString;
+        const Identifier& valueOf = exec->propertyNames().valueOf;
+        prototypeClass->m_staticFunctions->add(StringImpl::create(toString.characters(), toString.length()), new StaticFunctionEntry(&JSCallbackFunction::toStringCallback, 0));
+        prototypeClass->m_staticFunctions->add(StringImpl::create(valueOf.characters(), valueOf.length()), new StaticFunctionEntry(&JSCallbackFunction::valueOfCallback, 0));
+    }
+
     if (!prototypeClass)
         return 0;

trunk/Source/JavaScriptCore/API/tests/testapi.js

@@ -155 +155 @@
 shouldBe("MyObject ? 1 : 0", true); // toBoolean
 shouldBe("+MyObject", 1); // toNumber
-shouldBe("(MyObject.toString())", "[object MyObject]"); // toString
-shouldBe("String(MyObject)", "MyObjectAsString"); // type conversion to string
+shouldBe("(Object.prototype.toString.call(MyObject))", "[object MyObject]"); // Object.prototype.toString
+shouldBe("(MyObject.toString())", "MyObjectAsString"); // toString
+shouldBe("String(MyObject)", "MyObjectAsString"); // toString
 shouldBe("MyObject - 0", 1); // toNumber
+shouldBe("MyObject.valueOf()", 1); // valueOf
 
 shouldBe("typeof MyConstructor", "object");

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-10-04  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Implicitly add toString and valueOf to prototype when convertToType callback is provided
+        https://bugs.webkit.org/show_bug.cgi?id=69156
+
+        Reviewed by Geoffrey Garen.
+
+        Added callbacks for toString and valueOf which are implicitly added to a client object's
+        prototype if they provide a convertToType callback when declaring their class through 
+        the JSC API.
+
+        * API/JSCallbackFunction.cpp:
+        (JSC::JSCallbackFunction::toStringCallback):
+        (JSC::JSCallbackFunction::valueOfCallback):
+        * API/JSCallbackFunction.h:
+        * API/JSClassRef.cpp:
+        (OpaqueJSClass::prototype):
+        * API/tests/testapi.js:
+
 2011-10-03  Jon Lee  <jonlee@apple.com>