Changeset 37175 in webkit for trunk/JavaScriptCore/API

Timestamp:

Oct 1, 2008, 6:30:13 PM (17 years ago)

Author:

Darin Adler

Message:

2008-09-30 Darin Adler <Darin Adler>

Reviewed by Eric Seidel.

• ​https://bugs.webkit.org/show_bug.cgi?id=21214 work on getting rid of ExecState

Eliminate some unneeded uses of dynamicGlobalObject.

• API/JSClassRef.cpp: (OpaqueJSClass::contextData): Changed to use a map in the global data instead of on the global object. Also fixed to use only a single hash table lookup.

• API/JSObjectRef.cpp: (JSObjectMakeConstructor): Use lexicalGlobalObject rather than dynamicGlobalObject to get the object prototype.

• kjs/ArrayPrototype.cpp: (JSC::arrayProtoFuncToString): Use arrayVisitedElements set in global data rather than in the global object. (JSC::arrayProtoFuncToLocaleString): Ditto. (JSC::arrayProtoFuncJoin): Ditto.

• kjs/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData): Don't initialize opaqueJSClassData, since it's no longer a pointer. (JSC::JSGlobalData::~JSGlobalData): We still need to delete all the values, but we don't need to delete the map since it's no longer a pointer.

• kjs/JSGlobalData.h: Made opaqueJSClassData a map instead of a pointer to a map. Also added arrayVisitedElements.

• kjs/JSGlobalObject.h: Removed arrayVisitedElements.

• kjs/Shell.cpp: (functionRun): Use lexicalGlobalObject instead of dynamicGlobalObject. (functionLoad): Ditto.

Location:

trunk/JavaScriptCore/API

Files:

• JSClassRef.cpp (modified) (1 diff)
• JSObjectRef.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSClassRef.cpp

@@ -186 +186 @@
 OpaqueJSClassContextData& OpaqueJSClass::contextData(ExecState* exec)
 {
-    HashMap<OpaqueJSClass*, OpaqueJSClassContextData*>* contextDataMap = exec->globalData().opaqueJSClassData;
-    HashMap<OpaqueJSClass*, OpaqueJSClassContextData*>::iterator iter = contextDataMap->find(this);
-    if (iter != contextDataMap->end())
-        return *iter->second;
-    return *contextDataMap->add(this, new OpaqueJSClassContextData(this)).first->second;
+    OpaqueJSClassContextData*& contextData = exec->globalData().opaqueJSClassData.add(this, 0).first->second;
+    if (!contextData)
+        contextData = new OpaqueJSClassContextData(this);
+    return *contextData;
 }
 

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -106 +106 @@
     JSValue* jsPrototype = jsClass 
         ? jsClass->prototype(exec)
-        : exec->dynamicGlobalObject()->objectPrototype();
+        : exec->lexicalGlobalObject()->objectPrototype();
     
     JSCallbackConstructor* constructor = new (exec) JSCallbackConstructor(exec->lexicalGlobalObject()->callbackConstructorStructure(), jsClass, callAsConstructor);