Changeset 28468 in webkit for trunk/JavaScriptCore/kjs/testkjs.cpp

Timestamp:

Dec 5, 2007, 6:31:41 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and
functions accessing data members from Interpreter to JSGlobalObject.
Changed Interpreter member functions to static functions.

This resolves a bug in global object bootstrapping, where the global
ExecState could be used when uninitialized.

This is a big change, but it's mostly code motion and renaming.

Layout and JS tests, and testjsglue and testapi, pass. SunSpider reports
a .7% regression, but Shark sees no difference related to this patch,
and SunSpider reported a .7% speedup from an earlier step in this
refactoring, so I think it's fair to call that a wash.

JavaScriptGlue:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject. Replaced JSInterpreter
subclass with JSGlobalObject subclass.

• JSRun.cpp: (JSRun::JSRun): (JSRun::Evaluate): (JSRun::CheckSyntax):
• JSRun.h: (JSGlueGlobalObject::JSGlueGlobalObject):
• JSUtils.cpp: (KJSValueToCFTypeInternal):
• JSValueWrapper.cpp: (getThreadGlobalExecState):

WebCore:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject. Changed Interpreter
member functions to static functions. Same for the subclass,
ScriptInterpreter.

This is a big change, but it's mostly code motion and renaming.

WebKit/mac:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject.

• WebView/WebFrame.mm: (-[WebFrame _attachScriptDebugger]):

WebKit/win:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject.

• WebFrame.cpp: (WebFrame::globalContext): (WebFrame::attachScriptDebugger): (WebFrame::windowObjectCleared):
• WebScriptDebugger.cpp: (WebScriptDebugger::WebScriptDebugger):

File:

• trunk/JavaScriptCore/kjs/testkjs.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -28 +28 @@
 #include "Parser.h"
 #include "collector.h"
+#include "interpreter.h"
 #include "nodes.h"
 #include "object.h"
@@ -165 +166 @@
 
       stopWatch.start();
-      exec->dynamicInterpreter()->evaluate(fileName, 0, script.data());
+      Interpreter::evaluate(exec->dynamicGlobalObject()->globalExec(), fileName, 0, script.data());
       stopWatch.stop();
       
@@ -177 +178 @@
         return throwError(exec, GeneralError, "Could not open file.");
 
-      exec->dynamicInterpreter()->evaluate(fileName, 0, script.data());
+      Interpreter::evaluate(exec->dynamicGlobalObject()->globalExec(), fileName, 0, script.data());
 
       return jsUndefined();
@@ -225 +226 @@
 {
   GlobalImp* global = new GlobalImp;
-  Interpreter* interp = new Interpreter;
-  interp->setGlobalObject(global); // global now owns interp.
 
   // add debug() function
@@ -276 +275 @@
       prettyPrintScript(fileName, script);
     else {
-      Completion completion = globalObject->interpreter()->evaluate(fileName, 0, script.data());
+      Completion completion = Interpreter::evaluate(globalObject->globalExec(), fileName, 0, script.data());
       success = success && completion.complType() != Throw;
     }