Changeset 35775 in webkit for trunk/JavaScriptCore/API/JSObjectRef.cpp

Timestamp:

Aug 15, 2008, 12:43:48 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

JSStringRef is created context-free, but can get linked to one via an identifier table,
breaking an implicit API contract.

Made JSStringRef point to OpaqueJSString, which is a new string object separate from UString.

File:

• trunk/JavaScriptCore/API/JSObjectRef.cpp (modified) (11 diffs)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -37 +37 @@
 #include "JSGlobalObject.h"
 #include "JSObject.h"
+#include "JSRetainPtr.h"
 #include "JSString.h"
 #include "JSValueRef.h"
@@ -86 +87 @@
     exec->globalData().heap->registerThread();
 
-    Identifier nameID = name ? Identifier(exec, toJS(name)) : Identifier(exec, "anonymous");
+    Identifier nameID = name ? name->identifier(exec) : Identifier(exec, "anonymous");
     
     return toRef(new (exec) JSCallbackFunction(exec, callAsFunction, nameID));
@@ -110 +111 @@
     exec->globalData().heap->registerThread();
 
-    UString::Rep* bodyRep = toJS(body);
-    UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
-    
-    Identifier nameID = name ? Identifier(exec, toJS(name)) : Identifier(exec, "anonymous");
+    Identifier nameID = name ? name->identifier(exec) : Identifier(exec, "anonymous");
     
     ArgList args;
     for (unsigned i = 0; i < parameterCount; i++)
-        args.append(jsString(exec, UString(toJS(parameterNames[i]))));
-    args.append(jsString(exec, UString(bodyRep)));
-
-    JSObject* result = constructFunction(exec, args, nameID, UString(sourceURLRep), startingLineNumber);
+        args.append(jsString(exec, UString(parameterNames[i]->ustring())));
+    args.append(jsString(exec, body->ustring()));
+
+    JSObject* result = constructFunction(exec, args, nameID, sourceURL->ustring(), startingLineNumber);
     if (exec->hadException()) {
         if (exception)
@@ -150 +148 @@
 
     JSObject* jsObject = toJS(object);
-    UString::Rep* nameRep = toJS(propertyName);
-    
-    return jsObject->hasProperty(exec, Identifier(exec, nameRep));
+    
+    return jsObject->hasProperty(exec, propertyName->identifier(exec));
 }
 
@@ -161 +158 @@
 
     JSObject* jsObject = toJS(object);
-    UString::Rep* nameRep = toJS(propertyName);
-
-    JSValue* jsValue = jsObject->get(exec, Identifier(exec, nameRep));
+
+    JSValue* jsValue = jsObject->get(exec, propertyName->identifier(exec));
     if (exec->hadException()) {
         if (exception)
@@ -178 +174 @@
 
     JSObject* jsObject = toJS(object);
-    Identifier name(exec, toJS(propertyName));
+    Identifier name(propertyName->identifier(exec));
     JSValue* jsValue = toJS(value);
 
@@ -232 +228 @@
 
     JSObject* jsObject = toJS(object);
-    UString::Rep* nameRep = toJS(propertyName);
-
-    bool result = jsObject->deleteProperty(exec, Identifier(exec, nameRep));
+
+    bool result = jsObject->deleteProperty(exec,  propertyName->identifier(exec));
     if (exec->hadException()) {
         if (exception)
@@ -338 +333 @@
 }
 
-struct OpaqueJSPropertyNameArray
-{
-    OpaqueJSPropertyNameArray(JSGlobalData* globalData) : refCount(0), array(globalData)
+struct OpaqueJSPropertyNameArray {
+    OpaqueJSPropertyNameArray(JSGlobalData* globalData)
+        : refCount(0)
+        , globalData(globalData)
     {
     }
     
     unsigned refCount;
-    PropertyNameArray array;
+    JSGlobalData* globalData;
+    Vector<JSRetainPtr<JSStringRef> > array;
 };
 
@@ -354 +351 @@
     exec->globalData().heap->registerThread();
 
-    JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(&exec->globalData());
-    jsObject->getPropertyNames(exec, propertyNames->array);
+    JSGlobalData* globalData = &exec->globalData();
+
+    JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(globalData);
+    PropertyNameArray array(globalData);
+    jsObject->getPropertyNames(exec, array);
+
+    size_t size = array.size();
+    propertyNames->array.reserveCapacity(size);
+    for (size_t i = 0; i < size; ++i)
+        propertyNames->array.append(JSRetainPtr<JSStringRef>(Adopt, OpaqueJSString::create(array[i].ustring()).releaseRef()));
     
     return JSPropertyNameArrayRetain(propertyNames);
@@ -379 +384 @@
 JSStringRef JSPropertyNameArrayGetNameAtIndex(JSPropertyNameArrayRef array, size_t index)
 {
-    return toRef(array->array[static_cast<unsigned>(index)].ustring().rep());
+    return array->array[static_cast<unsigned>(index)].get();
 }
 
@@ -385 +390 @@
 {
     PropertyNameArray* propertyNames = toJS(array);
-    UString::Rep* rep = toJS(propertyName);
 
     propertyNames->globalData()->heap->registerThread();
 
-    propertyNames->add(Identifier(propertyNames->globalData(), rep));
-}
+    propertyNames->add(propertyName->identifier(propertyNames->globalData()));
+}