Changeset 28328 in webkit for trunk/JavaScriptCore/kjs/JSGlobalObject.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/JSGlobalObject.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -35 +35 @@
         JSGlobalObject(JSValue* proto) : JSObject(proto) { }
 
+        Interpreter* interpreter() const { return m_interpreter.get(); }
+        void setInterpreter(std::auto_ptr<Interpreter> i) { m_interpreter = i; }
+
+        virtual void mark();
+
         virtual bool isGlobalObject() const { return true; }
 
-        virtual void mark()
-        {
-            JSObject::mark();
-            m_interpreter->mark();
-        }
+        virtual ExecState* globalExec();
 
-        Interpreter* interpreter() const { return m_interpreter.get(); }
-        void setInterpreter(std::auto_ptr<Interpreter> i) { m_interpreter = i; }
+        virtual bool shouldInterruptScript() const { return true; }
+
+        virtual bool isSafeScript(const JSGlobalObject*) { return true; }
 
     private: