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

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -334 +334 @@
     bool global = reg->global();
 
-    RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalInterpreter()->builtinRegExp());
+    RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalGlobalObject()->regExpConstructor());
 
     int lastIndex = 0;
@@ -375 +375 @@
           args.append(sourceVal);
 
-          substitutedReplacement = replacementFunction->call(exec, exec->dynamicInterpreter()->globalObject(), 
+          substitutedReplacement = replacementFunction->call(exec, exec->dynamicGlobalObject(), 
                                                              args)->toString(exec);
       } else
@@ -425 +425 @@
       args.append(sourceVal);
       
-      replacementString = replacementFunction->call(exec, exec->dynamicInterpreter()->globalObject(), 
+      replacementString = replacementFunction->call(exec, exec->dynamicGlobalObject(), 
                                                     args)->toString(exec);
   }
@@ -549 +549 @@
       reg = tmpReg = new RegExp(a0->toString(exec));
     }
-    RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalInterpreter()->builtinRegExp());
+    RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalGlobalObject()->regExpConstructor());
     int pos;
     int matchLength;
@@ -578 +578 @@
         result = jsNull();
       } else {
-        result = exec->lexicalInterpreter()->builtinArray()->construct(exec, list);
+        result = exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, list);
       }
     }
@@ -605 +605 @@
       reg = tmpReg = new RegExp(a0->toString(exec));
     }
-    RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalInterpreter()->builtinRegExp());
+    RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalGlobalObject()->regExpConstructor());
     int pos;
     int matchLength;
@@ -661 +661 @@
     JSValue* a1 = args[1];
 
-    JSObject *constructor = exec->lexicalInterpreter()->builtinArray();
+    JSObject *constructor = exec->lexicalGlobalObject()->arrayConstructor();
     JSObject *res = static_cast<JSObject *>(constructor->construct(exec,List::empty()));
     JSValue* result = res;
@@ -1019 +1019 @@
 JSObject *StringObjectImp::construct(ExecState *exec, const List &args)
 {
-  JSObject *proto = exec->lexicalInterpreter()->builtinStringPrototype();
+  JSObject *proto = exec->lexicalGlobalObject()->stringPrototype();
   if (args.size() == 0)
     return new StringInstance(proto);