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

Timestamp:

Oct 24, 2007, 11:38:35 PM (18 years ago)

Author:

eseidel

Message:

2007-10-24 Eric Seidel <​[email protected]>

Reviewed by Maciej.

Add a JSGlobalObject class and remove the InterpreterMap
​http://bugs.webkit.org/show_bug.cgi?id=15681

This required making JSCallbackObject a template class to allow for
JSGlobalObjects with JSCallbackObject functionality.

SunSpider claims this was a 0.5% speedup.

• API/JSCallbackObject.cpp: (KJS::):
• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h: Copied from API/JSCallbackObject.cpp. (KJS::::JSCallbackObject): (KJS::::init): (KJS::::~JSCallbackObject): (KJS::::initializeIfNeeded): (KJS::::className): (KJS::::getOwnPropertySlot): (KJS::::put): (KJS::::deleteProperty): (KJS::::implementsConstruct): (KJS::::construct): (KJS::::implementsHasInstance): (KJS::::hasInstance): (KJS::::implementsCall): (KJS::::callAsFunction): (KJS::::getPropertyNames): (KJS::::toNumber): (KJS::::toString): (KJS::::setPrivate): (KJS::::getPrivate): (KJS::::inherits): (KJS::::cachedValueGetter): (KJS::::staticValueGetter): (KJS::::staticFunctionGetter): (KJS::::callbackGetter):
• API/JSClassRef.cpp: (OpaqueJSClass::prototype):
• API/JSContextRef.cpp: (JSGlobalContextCreate):
• API/JSObjectRef.cpp: (JSObjectMake): (JSObjectGetPrivate): (JSObjectSetPrivate):
• API/JSValueRef.cpp: (JSValueIsObjectOfClass):
• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bindings/c/c_utility.cpp: (KJS::Bindings::convertValueToNPVariant):
• bindings/jni/jni_jsobject.cpp:
• bindings/objc/objc_utility.mm: (KJS::Bindings::convertValueToObjcValue):
• kjs/Context.cpp: (KJS::Context::Context):
• kjs/ExecState.cpp: (KJS::ExecState::lexicalInterpreter):
• kjs/JSGlobalObject.h: Added. (KJS::JSGlobalObject::JSGlobalObject): (KJS::JSGlobalObject::isGlobalObject): (KJS::JSGlobalObject::interpreter): (KJS::JSGlobalObject::setInterpreter):
• kjs/array_instance.cpp:
• kjs/context.h:
• kjs/function.cpp: (KJS::FunctionImp::callAsFunction): (KJS::GlobalFuncImp::callAsFunction):
• kjs/interpreter.cpp: (KJS::Interpreter::Interpreter): (KJS::Interpreter::init): (KJS::Interpreter::~Interpreter): (KJS::Interpreter::globalObject): (KJS::Interpreter::initGlobalObject): (KJS::Interpreter::evaluate):
• kjs/interpreter.h:
• kjs/lookup.h: (KJS::cacheGlobalObject):
• kjs/object.h: (KJS::JSObject::isGlobalObject):
• kjs/testkjs.cpp:

File:

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

trunk/JavaScriptCore/kjs/interpreter.h

@@ -46 +46 @@
   class FunctionObjectImp;
   class FunctionPrototype;
+  class JSGlobalObject;
   class NativeErrorImp;
   class NativeErrorPrototype;
@@ -95 +96 @@
      * @param global The object to use as the global object for this interpreter
      */
-    Interpreter(JSObject* globalObject);
+    Interpreter(JSGlobalObject*);
     /**
      * Creates a new interpreter. A global object will be created and
@@ -112 +113 @@
      * execution performed by this interpreter
      */
-    JSObject* globalObject() const;
+    JSGlobalObject* globalObject() const;
 
     /**
@@ -301 +302 @@
     void saveBuiltins (SavedBuiltins&) const;
     void restoreBuiltins (const SavedBuiltins&);
-
-    /**
-     * Determine if the value is a global object (for any interpreter).  This may
-     * be difficult to determine for multiple uses of JSC in a process that are
-     * logically independent of each other.  In the case of WebCore, this method
-     * is used to determine if an object is the Window object so we can perform
-     * security checks.
-     */
-    virtual bool isGlobalObject(JSValue*) { return false; }
-    
-    /** 
-     * Find the interpreter for a particular global object.  This should really
-     * be a static method, but we can't do that is C++.  Again, as with isGlobalObject()
-     * implementation really need to know about all instances of Interpreter
-     * created in an application to correctly implement this method.  The only
-     * override of this method is currently in WebCore.
-     */
-    virtual Interpreter* interpreterForGlobalObject(const JSValue*) { return 0; }
     
     /**
@@ -338 +321 @@
     void setContext(Context* c) { m_context = c; }
     Context* context() const { return m_context; }
-    
-    static Interpreter* interpreterWithGlobalObject(JSObject*);
-    
+        
     void setTimeoutTime(unsigned timeoutTime) { m_timeoutTime = timeoutTime; }
 
@@ -389 +370 @@
     unsigned m_ticksUntilNextTimeoutCheck;
 
-    JSObject* m_globalObject;
+    JSGlobalObject* m_globalObject;
 
     ObjectObjectImp* m_Object;