Changeset 2753 in webkit for trunk/JavaScriptCore/kjs/object.cpp

Timestamp:

Nov 18, 2002, 11:57:11 PM (23 years ago)

Author:

darin

Message:

JavaScriptCore:

• reduced the creation of Value objects and hoisted the property map into Object for another gain of about 6%

• JavaScriptCore.pbproj/project.pbxproj: Made property_map.h public.
• kjs/array_object.cpp: (compareWithCompareFunctionForQSort): Don't wrap the ValueImp * in a Value just to add it to a list. (ArrayProtoFuncImp::call): Pass the globalObject directly so we don't have to ref/deref.
• kjs/function.cpp: (FunctionImp::call): Use a reference for the global object to avoid ref/deref. (GlobalFuncImp::call): Ditto.
• kjs/internal.cpp: (BooleanImp::toObject): Put the object directly into the list, don't create a Value. (StringImp::toObject): Ditto. (NumberImp::toObject): Ditto. (InterpreterImp::evaluate): Use a reference for the global object.
• kjs/internal.h: Return a reference for the global object.
• kjs/interpreter.cpp: (Interpreter::globalObject): Ditto.
• kjs/interpreter.h: Ditto.
• kjs/object.cpp: Use _prop directly in the object, not a separate pointer.
• kjs/object.h: Ditto.
• kjs/types.cpp: Added List methods that work directly with ValueImp. (List::append): Added a ValueImp version. (List::prepend): Ditto. (List::appendList): Work directly with the ValueImp's. (List::prependList): Ditto. (List::copy): Use appendList. (List::empty): Use a shared global List.
• kjs/types.h: Update for above changes.

WebCore:

• force-js-clean-timestamp: Another Object change.

File:

• trunk/JavaScriptCore/kjs/object.cpp (modified) (12 diffs)

trunk/JavaScriptCore/kjs/object.cpp

@@ -38 +38 @@
 #include "error_object.h"
 #include "nodes.h"
-#include "property_map.h"
 
 namespace KJS {
@@ -62 +61 @@
 
 ObjectImp::ObjectImp(const Object &proto)
-  : _prop(0), _proto(static_cast<ObjectImp*>(proto.imp())), _internalValue(0L), _scope(true)
+  : _proto(static_cast<ObjectImp*>(proto.imp())), _internalValue(0L), _scope(true)
 {
   //fprintf(stderr,"ObjectImp::ObjectImp %p\n",(void*)this);
-  _prop = new PropertyMap();
 }
 
@@ -72 +70 @@
 {
   //fprintf(stderr,"ObjectImp::ObjectImp %p\n",(void*)this);
-  _prop = 0;
   _proto = NullImp::staticNull;
   _internalValue = 0L;
-  _prop = new PropertyMap();
 }
 
@@ -81 +77 @@
 {
   //fprintf(stderr,"ObjectImp::~ObjectImp %p\n",(void*)this);
-  delete _prop;
 }
 
@@ -92 +87 @@
     _proto->mark();
 
-  _prop->mark();
+  _prop.mark();
 
   if (_internalValue && !_internalValue->marked())
@@ -171 +166 @@
 ValueImp* ObjectImp::getDirect(const UString& propertyName) const
 {
-  return _prop->get(propertyName);
+  return _prop.get(propertyName);
 }
 
@@ -199 +194 @@
   }
 
-  _prop->put(propertyName,value.imp(),attr);
+  _prop.put(propertyName,value.imp(),attr);
 }
 
@@ -212 +207 @@
 {
   int attributes;
-  ValueImp *v = _prop->get(propertyName, attributes);
+  ValueImp *v = _prop.get(propertyName, attributes);
   if (v)
     return!(attributes & ReadOnly);
@@ -229 +224 @@
 bool ObjectImp::hasProperty(ExecState *exec, const UString &propertyName) const
 {
-  if (_prop->get(propertyName))
+  if (_prop.get(propertyName))
     return true;
 
@@ -254 +249 @@
 {
   int attributes;
-  ValueImp *v = _prop->get(propertyName, attributes);
+  ValueImp *v = _prop.get(propertyName, attributes);
   if (v) {
     if ((attributes & DontDelete))
       return false;
-    _prop->remove(propertyName);
+    _prop.remove(propertyName);
     return true;
   }
@@ -276 +271 @@
 void ObjectImp::deleteAllProperties( ExecState * )
 {
-  _prop->clear();
+  _prop.clear();
 }
 
@@ -397 +392 @@
     list = static_cast<ObjectImp*>(_proto)->propList(exec,recursive);
 
-  _prop->addEnumerablesToReferenceList(list, Object(this));
+  _prop.addEnumerablesToReferenceList(list, Object(this));
 
   // Add properties from the static hashtable of properties