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

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -37 +37 @@
 #include "JSGlobalObject.h"
 
+#include "PropertyNameArray.h"
+#include "function.h"
+#include "function_object.h"
 #include "identifier.h"
-#include "function.h"
 #include "internal.h"
 #include "object.h"
-#include "PropertyNameArray.h"
+#include "object_object.h"
 
 using namespace KJS;
@@ -74 +76 @@
 
     if (!jsClass)
-        return toRef(new JSObject(exec->lexicalInterpreter()->builtinObjectPrototype())); // slightly more efficient
+        return toRef(new JSObject(exec->lexicalGlobalObject()->objectPrototype())); // slightly more efficient
 
     JSValue* jsPrototype = jsClass->prototype(ctx);
     if (!jsPrototype)
-        jsPrototype = exec->lexicalInterpreter()->builtinObjectPrototype();
+        jsPrototype = exec->lexicalGlobalObject()->objectPrototype();
 
     return toRef(new JSCallbackObject<JSObject>(exec, jsClass, jsPrototype, data));
@@ -99 +101 @@
     JSValue* jsPrototype = jsClass 
         ? jsClass->prototype(ctx)
-        : exec->dynamicInterpreter()->builtinObjectPrototype();
+        : exec->dynamicGlobalObject()->objectPrototype();
     
     JSObject* constructor = new JSCallbackConstructor(exec, jsClass, callAsConstructor);
@@ -121 +123 @@
     args.append(jsString(UString(bodyRep)));
 
-    JSObject* result = exec->dynamicInterpreter()->builtinFunction()->construct(exec, args, nameID, UString(sourceURLRep), startingLineNumber);
+    JSObject* result = exec->dynamicGlobalObject()->functionConstructor()->construct(exec, args, nameID, UString(sourceURLRep), startingLineNumber);
     if (exec->hadException()) {
         if (exception)
@@ -275 +277 @@
 
     if (!jsThisObject)
-        jsThisObject = exec->dynamicInterpreter()->globalObject();
+        jsThisObject = exec->dynamicGlobalObject();
     
     List argList;