Changeset 35159 in webkit for trunk/JavaScriptCore/kjs/Shell.cpp

Timestamp:

Jul 14, 2008, 4:28:57 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

Eliminate per-thread JavaScript global data instance support and make arbitrary
global data/global object combinations possible.

File:

• trunk/JavaScriptCore/kjs/Shell.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/Shell.cpp

@@ -286 +286 @@
 #endif
 
-int jscmain(int argc, char** argv);
+int jscmain(int argc, char** argv, JSGlobalData*);
 
 int main(int argc, char** argv)
@@ -301 +301 @@
     int res = 0;
     TRY
-        res = jscmain(argc, argv);
-#ifndef NDEBUG
-        JSLock::lock(false);
-        JSGlobalData::threadInstance().heap->collect();
-        JSLock::unlock(false);
-#endif
+        JSGlobalData* globalData = new JSGlobalData;
+        res = jscmain(argc, argv, globalData);
+        delete globalData;
     EXCEPT(res = 3)
     return res;
@@ -447 +444 @@
 }
 
-int jscmain(int argc, char** argv)
+int jscmain(int argc, char** argv, JSGlobalData* globalData)
 {
     KJS::initializeThreading();
@@ -456 +453 @@
     parseArguments(argc, argv, options);
 
-    GlobalObject* globalObject = new GlobalObject(options.arguments);
+    GlobalObject* globalObject = new (globalData) GlobalObject(options.arguments);
     bool success = runWithScripts(globalObject, options.fileNames, options.prettyPrint, options.dump);
     if (options.interactive && success)