Changeset 56314 in webkit for trunk/JavaScriptCore/API/tests/testapi.c

Timestamp:

Mar 21, 2010, 12:40:04 AM (15 years ago)

Author:

[email protected]

Message:

2010-03-20 Oliver Hunt <​[email protected]>

Reviewed by Maciej Stachowiak.

JSC needs an API to allow custom objects to have aprivate GC-accessible properties
​https://bugs.webkit.org/show_bug.cgi?id=36420

Add new API methods to support "private" properties on custom
objects.

• API/JSCallbackObject.h: (JSC::JSCallbackObjectData::JSCallbackObjectData): (JSC::JSCallbackObjectData::~JSCallbackObjectData): (JSC::JSCallbackObjectData::getPrivateProperty): (JSC::JSCallbackObjectData::setPrivateProperty): (JSC::JSCallbackObjectData::deletePrivateProperty): (JSC::JSCallbackObjectData::markChildren): (JSC::JSCallbackObjectData::JSPrivatePropertyMap::getPrivateProperty): (JSC::JSCallbackObjectData::JSPrivatePropertyMap::setPrivateProperty): (JSC::JSCallbackObjectData::JSPrivatePropertyMap::deletePrivateProperty): (JSC::JSCallbackObjectData::JSPrivatePropertyMap::markChildren): (JSC::JSCallbackObject::getPrivateProperty): (JSC::JSCallbackObject::setPrivateProperty): (JSC::JSCallbackObject::deletePrivateProperty): (JSC::JSCallbackObject::markChildren):
• API/JSObjectRef.cpp: (JSObjectGetPrivateProperty): (JSObjectSetPrivateProperty): (JSObjectDeletePrivateProperty):
• API/JSObjectRefPrivate.h: Added.
• API/tests/testapi.c: (main):
• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:

File:

• trunk/JavaScriptCore/API/tests/testapi.c (modified) (3 diffs)

trunk/JavaScriptCore/API/tests/testapi.c

@@ -43 +43 @@
 #endif
 
+bool JSObjectSetPrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value);
+JSValueRef JSObjectGetPrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName);
+bool JSObjectDeletePrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName);
+
 static JSGlobalContextRef context;
 static int failed;
@@ -754 +758 @@
 
 static JSValueRef jsNumberValue =  NULL;
+
+static JSObjectRef aHeapRef = NULL;
 
 static void makeGlobalNumberValue(JSContextRef context) {
@@ -870 +876 @@
     JSObjectSetProperty(context, globalObject, EmptyObjectIString, EmptyObject, kJSPropertyAttributeNone, NULL);
     JSStringRelease(EmptyObjectIString);
-
+    
+    JSStringRef lengthStr = JSStringCreateWithUTF8CString("length");
+    aHeapRef = JSObjectMakeArray(context, 0, 0, 0);
+    JSObjectSetProperty(context, aHeapRef, lengthStr, JSValueMakeNumber(context, 10), 0, 0);
+    JSStringRef privatePropertyName = JSStringCreateWithUTF8CString("privateProperty");
+    if (!JSObjectSetPrivateProperty(context, myObject, privatePropertyName, aHeapRef)) {
+        printf("FAIL: Could not set private property.\n");
+        failed = 1;        
+    } else {
+        printf("PASS: Set private property.\n");
+    }
+    if (JSObjectSetPrivateProperty(context, aHeapRef, privatePropertyName, aHeapRef)) {
+        printf("FAIL: JSObjectSetPrivateProperty should fail on non-API objects.\n");
+        failed = 1;        
+    } else {
+        printf("PASS: Did not allow JSObjectSetPrivateProperty on a non-API object.\n");
+    }
+    if (JSObjectGetPrivateProperty(context, myObject, privatePropertyName) != aHeapRef) {
+        printf("FAIL: Could not retrieve private property.\n");
+        failed = 1;
+    } else
+        printf("PASS: Retrieved private property.\n");
+    if (JSObjectGetPrivateProperty(context, aHeapRef, privatePropertyName)) {
+        printf("FAIL: JSObjectGetPrivateProperty should return NULL when called on a non-API object.\n");
+        failed = 1;
+    } else
+        printf("PASS: JSObjectGetPrivateProperty return NULL.\n");
+    
+    if (JSObjectGetProperty(context, myObject, privatePropertyName, 0) == aHeapRef) {
+        printf("FAIL: Accessed private property through ordinary property lookup.\n");
+        failed = 1;
+    } else
+        printf("PASS: Cannot access private property through ordinary property lookup.\n");
+    
+    JSGarbageCollect(context);
+    
+    for (int i = 0; i < 10000; i++)
+        JSObjectMake(context, 0, 0);
+
+    if (JSValueToNumber(context, JSObjectGetProperty(context, aHeapRef, lengthStr, 0), 0) != 10) {
+        printf("FAIL: Private property has been collected.\n");
+        failed = 1;
+    } else
+        printf("PASS: Private property does not appear to have been collected.\n");
+    JSStringRelease(lengthStr);
+    
     JSStringRef validJSON = JSStringCreateWithUTF8CString("{\"aProperty\":true}");
     JSValueRef jsonObject = JSValueMakeFromJSONString(context, validJSON);