Changeset 35775 in webkit for trunk/JavaScriptCore/API/JSValueRef.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/JSValueRef.cpp (modified) (2 diffs)

trunk/JavaScriptCore/API/JSValueRef.cpp

@@ -189 +189 @@
     exec->globalData().heap->registerThread();
 
-    UString::Rep* rep = toJS(string);
-    return toRef(jsString(exec, UString(rep)));
+    return toRef(jsString(exec, string->ustring()));
 }
 
@@ -224 +223 @@
     JSValue* jsValue = toJS(value);
     
-    JSStringRef stringRef = toRef(jsValue->toString(exec).rep()->ref());
-    if (exec->hadException()) {
-        if (exception)
-            *exception = toRef(exec->exception());
-        exec->clearException();
-        stringRef = 0;
-    }
-    return stringRef;
+    RefPtr<OpaqueJSString> stringRef(OpaqueJSString::create(jsValue->toString(exec)));
+    if (exec->hadException()) {
+        if (exception)
+            *exception = toRef(exec->exception());
+        exec->clearException();
+        stringRef.clear();
+    }
+    return stringRef.release().releaseRef();
 }