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

trunk/JavaScriptCore/API/JSBase.cpp

@@ -30 +30 @@
 #include "APICast.h"
 #include "completion.h"
+#include "OpaqueJSString.h"
 #include <kjs/ExecState.h>
 #include <kjs/InitializeThreading.h>
@@ -44 +45 @@
 
     JSObject* jsThisObject = toJS(thisObject);
-    UString::Rep* scriptRep = toJS(script);
-    UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
 
     // Interpreter::evaluate sets "this" to the global object if it is NULL
     JSGlobalObject* globalObject = exec->dynamicGlobalObject();
-    Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), UString(sourceURLRep), startingLineNumber, UString(scriptRep), jsThisObject);
+    Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), sourceURL->ustring(), startingLineNumber, script->ustring(), jsThisObject);
 
     if (completion.complType() == Throw) {
@@ -69 +68 @@
     exec->globalData().heap->registerThread();
 
-    UString::Rep* scriptRep = toJS(script);
-    UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
-    Completion completion = Interpreter::checkSyntax(exec->dynamicGlobalObject()->globalExec(), UString(sourceURLRep), startingLineNumber, UString(scriptRep));
+    Completion completion = Interpreter::checkSyntax(exec->dynamicGlobalObject()->globalExec(), sourceURL->ustring(), startingLineNumber, script->ustring());
     if (completion.complType() == Throw) {
         if (exception)