Changeset 28468 in webkit for trunk/JavaScriptCore/bindings/runtime_root.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/bindings/runtime_root.cpp (modified) (3 diffs)

trunk/JavaScriptCore/bindings/runtime_root.cpp

@@ -51 +51 @@
 // fix them by adding a JSObject to RootObject dictionary.
 
-RootObject* findRootObject(JSObject* jsObject)
+RootObject* findProtectingRootObject(JSObject* jsObject)
 {
     RootObjectSet::const_iterator end = rootObjectSet()->end();
@@ -61 +61 @@
 }
 
-RootObject* findRootObject(Interpreter* interpreter)
+RootObject* findRootObject(JSGlobalObject* globalObject)
 {
     RootObjectSet::const_iterator end = rootObjectSet()->end();
     for (RootObjectSet::const_iterator it = rootObjectSet()->begin(); it != end; ++it) {
-        if ((*it)->interpreter() == interpreter)
+        if ((*it)->globalObject() == globalObject)
             return *it;
     }
@@ -281 +281 @@
 }
 
-Interpreter* RootObject::interpreter() const 
-{ 
-    ASSERT(m_isValid);
-    return m_globalObject->interpreter();
-}
-
 JSGlobalObject* RootObject::globalObject() const
 {