Changeset 28468 in webkit for trunk/JavaScriptCore/kjs/function_object.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/function_object.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -104 +104 @@
     JSObject *applyThis;
     if (thisArg->isUndefinedOrNull())
-      applyThis = exec->dynamicInterpreter()->globalObject();
+      applyThis = exec->dynamicGlobalObject();
     else
       applyThis = thisArg->toObject(exec);
@@ -134 +134 @@
     JSObject *callThis;
     if (thisArg->isUndefinedOrNull())
-      callThis = exec->dynamicInterpreter()->globalObject();
+      callThis = exec->dynamicGlobalObject();
     else
       callThis = thisArg->toObject(exec);
@@ -192 +192 @@
 
   // notify debugger that source has been parsed
-  Debugger *dbg = exec->dynamicInterpreter()->debugger();
+  Debugger *dbg = exec->dynamicGlobalObject()->debugger();
   if (dbg) {
     // send empty sourceURL to indicate constructed code
@@ -209 +209 @@
 
   ScopeChain scopeChain;
-  scopeChain.push(exec->lexicalInterpreter()->globalObject());
+  scopeChain.push(exec->lexicalGlobalObject());
 
   FunctionImp* fimp = new FunctionImp(exec, functionName, functionBody.get(), scopeChain);
@@ -246 +246 @@
   List consArgs;
 
-  JSObject* objCons = exec->lexicalInterpreter()->builtinObject();
+  JSObject* objCons = exec->lexicalGlobalObject()->objectConstructor();
   JSObject* prototype = objCons->construct(exec,List::empty());
   prototype->put(exec, exec->propertyNames().constructor, fimp, DontEnum|DontDelete|ReadOnly);