Changeset 28328 in webkit for trunk/JavaScriptCore/kjs/interpreter.h

Timestamp:

Dec 2, 2007, 11:43:29 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Eric Seidel.

Second step in refactoring JSGlobalObject: moved virtual functions from
Interpreter to JSGlobalObject.

Layout and JS tests pass. SunSpider reports a .7% speedup -- don't
believe his lies.

JavaScriptGlue:

Reviewed by Eric Seidel.

Updated to match the JavaScriptCore change to move virtual methods from
Interpreter to JSGlobalObject.

• JSRun.cpp:
• JSRun.h:
• JSValueWrapper.cpp: (getThreadGlobalExecState):
• JavaScriptGlue.cpp: (JSRunCopyGlobalObject): (JSRunEvaluate):

WebCore:

Reviewed by Eric Seidel.

Updated to match the JavaScriptCore change to move virtual methods from
Interpreter to JSGlobalObject.

Moved virtual ScriptInterpreter functions to Window.

WebKit/mac:

Reviewed by Eric Seidel.

Updated to match the JavaScriptCore change to move virtual methods from
Interpreter to JSGlobalObject.

• WebView/WebFrame.mm: (-[WebFrame globalContext]): Use the toRef function instead of manually casting.

File:

• trunk/JavaScriptCore/kjs/interpreter.h (modified) (7 diffs)

trunk/JavaScriptCore/kjs/interpreter.h

@@ -79 +79 @@
   class Interpreter {
     friend class Collector;
+    friend class JSGlobalObject;
+
   public:
     /**
@@ -85 +87 @@
      */
     Interpreter();
-    
-    virtual ~Interpreter(); // only deref should delete us
+    ~Interpreter();
 
     /**
@@ -117 +118 @@
      */
     JSGlobalObject* globalObject() const;
-
-    /**
-     * Returns the execution state object which can be used to execute
-     * scripts using this interpreter at a the "global" level, i.e. one
-     * with a execution context that has the global object as the "this"
-     * value, and who's scope chain contains only the global object.
-     *
-     * Note: this pointer remains constant for the life of the interpreter
-     * and should not be manually deleted.
-     *
-     * @return The interpreter global execution state object
-     */
-    virtual ExecState *globalExec();
 
     /**
@@ -281 +269 @@
     CompatMode compatMode() const { return m_compatMode; }
     
-    /**
-     * Run the garbage collection. Returns true when at least one object
-     * was collected; false otherwise.
-     */
-    static bool collect();
-
-    /**
-     * Called during the mark phase of the garbage collector. Subclasses 
-     * implementing custom mark methods must make sure to chain to this one.
-     */
-    virtual void mark();
-
     static bool shouldPrintExceptions();
     static void setShouldPrintExceptions(bool);
@@ -299 +275 @@
     void restoreBuiltins (const SavedBuiltins&);
     
-    /**
-     * Determine if the it is 'safe' to execute code in the target interpreter from an
-     * object that originated in this interpreter.  This check is used to enforce WebCore
-     * cross frame security rules.  In particular, attempts to access 'bound' objects are
-     * not allowed unless isSafeScript returns true.
-     */
-    virtual bool isSafeScript(const Interpreter*) { return true; }
-  
     // Chained list of interpreters (ring)
     static Interpreter* firstInterpreter() { return s_hook; }
@@ -325 +293 @@
     bool timedOut();
     
+    ExecState m_globalExec; // This is temporarily public to help with bootstrapping.
+
 protected:
-    virtual bool shouldInterruptScript() const { return true; }
-
     unsigned m_timeoutTime;
 
@@ -345 +313 @@
     ExecState* m_currentExec;
     JSGlobalObject* m_globalObject;
-    ExecState m_globalExec;
 
     // Chained list of interpreters (ring) - for collector