Changeset 27022 in webkit for trunk/JavaScriptCore/API/JSObjectRef.cpp

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/API/JSObjectRef.cpp (modified) (4 diffs)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -33 +33 @@
 #include "JSCallbackObject.h"
 #include "JSClassRef.h"
+#include "JSGlobalObject.h"
 
 #include "identifier.h"
@@ -78 +79 @@
         jsPrototype = exec->lexicalInterpreter()->builtinObjectPrototype();
 
-    return toRef(new JSCallbackObject(exec, jsClass, jsPrototype, data));
+    return toRef(new JSCallbackObject<JSObject>(exec, jsClass, jsPrototype, data));
 }
 
@@ -236 +237 @@
     JSObject* jsObject = toJS(object);
     
-    if (jsObject->inherits(&JSCallbackObject::info))
-        return static_cast<JSCallbackObject*>(jsObject)->getPrivate();
+    if (jsObject->inherits(&JSCallbackObject<JSGlobalObject>::info))
+        return static_cast<JSCallbackObject<JSGlobalObject>*>(jsObject)->getPrivate();
+    else if (jsObject->inherits(&JSCallbackObject<JSObject>::info))
+        return static_cast<JSCallbackObject<JSObject>*>(jsObject)->getPrivate();
     
     return 0;
@@ -246 +249 @@
     JSObject* jsObject = toJS(object);
     
-    if (jsObject->inherits(&JSCallbackObject::info)) {
-        static_cast<JSCallbackObject*>(jsObject)->setPrivate(data);
+    if (jsObject->inherits(&JSCallbackObject<JSGlobalObject>::info)) {
+        static_cast<JSCallbackObject<JSGlobalObject>*>(jsObject)->setPrivate(data);
+        return true;
+    } else if (jsObject->inherits(&JSCallbackObject<JSObject>::info)) {
+        static_cast<JSCallbackObject<JSObject>*>(jsObject)->setPrivate(data);
         return true;
     }