Changeset 28468 in webkit for trunk/JavaScriptCore/kjs/debugger.h

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.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/debugger.h

@@ -30 +30 @@
 
   class DebuggerImp;
-  class Interpreter;
   class ExecState;
   class JSObject;
@@ -59 +58 @@
 
     /**
-     * Destroys the debugger. If the debugger is attached to any interpreters,
+     * Destroys the debugger. If the debugger is attached to any global objects,
      * it is automatically detached.
      */
@@ -67 +66 @@
 
     /**
-     * Attaches the debugger to specified interpreter. This will cause this
-     * object to receive notification of events from the interpreter.
-     *
-     * If the interpreter is deleted, the debugger will automatically be
-     * detached.
-     *
-     * Note: only one debugger can be attached to an interpreter at a time.
-     * Attaching another debugger to the same interpreter will cause the
-     * original debugger to be detached from that interpreter.
-     *
-     * @param interp The interpreter to attach to
+     * Attaches the debugger to specified global object. This will cause this
+     * object to receive notification of events during execution.
+     *
+     * If the global object is deleted, it will detach the debugger.
+     *
+     * Note: only one debugger can be attached to a global object at a time.
+     * Attaching another debugger to the same global object will cause the
+     * original debugger to be detached.
+     *
+     * @param The global object to attach to.
      *
      * @see detach()
      */
-    void attach(Interpreter *interp);
-
-    /**
-     * Detach the debugger from an interpreter
-     *
-     * @param interp The interpreter to detach from. If 0, the debugger will be
-     * detached from all interpreters to which it is attached.
+    void attach(JSGlobalObject*);
+
+    /**
+     * Detach the debugger from a global object.
+     *
+     * @param The global object to detach from. If 0, the debugger will be
+     * detached from all global objects to which it is attached.
      *
      * @see attach()
      */
-    void detach(Interpreter *interp);
+    void detach(JSGlobalObject*);
 
     /**
@@ -216 +214 @@
   private:
     DebuggerImp *rep;
-    HashMap<Interpreter*, ProtectedPtr<JSValue> > latestExceptions;
+    HashMap<JSGlobalObject*, ProtectedPtr<JSValue> > latestExceptions;
 
   public: