Changeset 96627 in webkit for trunk/Source/JavaScriptCore/API/JSCallbackFunction.cpp

Timestamp:

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

Author:

[email protected]

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:

File:

• trunk/Source/JavaScriptCore/API/JSCallbackFunction.cpp (modified) (2 diffs)

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