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

trunk/JavaScriptCore/kjs/debugger.cpp

@@ -32 +32 @@
 
 namespace KJS {
-  struct AttachedInterpreter
+  struct AttachedGlobalObject
   {
   public:
-    AttachedInterpreter(Interpreter *i, AttachedInterpreter *ai) : interp(i), next(ai) { ++Debugger::debuggersPresent; }
-    ~AttachedInterpreter() { --Debugger::debuggersPresent; }
-    Interpreter *interp;
-    AttachedInterpreter *next;
+    AttachedGlobalObject(JSGlobalObject* o, AttachedGlobalObject* ai) : globalObj(o), next(ai) { ++Debugger::debuggersPresent; }
+    ~AttachedGlobalObject() { --Debugger::debuggersPresent; }
+    JSGlobalObject* globalObj;
+    AttachedGlobalObject* next;
   };
 
@@ -56 +56 @@
 }
 
-void Debugger::attach(Interpreter* interp)
+void Debugger::attach(JSGlobalObject* globalObject)
 {
-  Debugger *other = interp->debugger();
+  Debugger* other = globalObject->debugger();
   if (other == this)
     return;
   if (other)
-    other->detach(interp);
-  interp->setDebugger(this);
-  rep->interps = new AttachedInterpreter(interp, rep->interps);
+    other->detach(globalObject);
+  globalObject->setDebugger(this);
+  rep->globalObjects = new AttachedGlobalObject(globalObject, rep->globalObjects);
 }
 
-void Debugger::detach(Interpreter* interp)
+void Debugger::detach(JSGlobalObject* globalObj)
 {
-  // iterate the addresses where AttachedInterpreter pointers are stored
+  // iterate the addresses where AttachedGlobalObject pointers are stored
   // so we can unlink items from the list
-  AttachedInterpreter **p = &rep->interps;
-  AttachedInterpreter *q;
+  AttachedGlobalObject **p = &rep->globalObjects;
+  AttachedGlobalObject *q;
   while ((q = *p)) {
-    if (!interp || q->interp == interp) {
+    if (!globalObj || q->globalObj == globalObj) {
       *p = q->next;
-      q->interp->setDebugger(0);
+      q->globalObj->setDebugger(0);
       delete q;
     } else
@@ -82 +82 @@
   }
 
-  if (interp)
-    latestExceptions.remove(interp);
+  if (globalObj)
+    latestExceptions.remove(globalObj);
   else
     latestExceptions.clear();
@@ -90 +90 @@
 bool Debugger::hasHandledException(ExecState *exec, JSValue *exception)
 {
-    if (latestExceptions.get(exec->dynamicInterpreter()).get() == exception)
+    if (latestExceptions.get(exec->dynamicGlobalObject()).get() == exception)
         return true;
 
-    latestExceptions.set(exec->dynamicInterpreter(), exception);
+    latestExceptions.set(exec->dynamicGlobalObject(), exception);
     return false;
 }