Changeset 15385 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 12, 2006, 3:01:06 AM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Removed context and exception parameters from JSObjectGetPropertyEnumerator, removing the spurious use of ExecState inside JavaScriptCore that made us think this was necessary in the first place.

(StringInstance::getPropertyList): Use getString instead of toString because
we know we're dealing with a string -- we put it there in the first place.
While we're at it, store the string's size instead of retrieving it each time
through the loop, to avoid the unnecessary killing of puppies.

• kjs/string_object.h:

Location:

trunk/JavaScriptCore

Files:

• API/JSCallbackObject.cpp (modified) (2 diffs)
• API/JSCallbackObject.h (modified) (1 diff)
• API/JSObjectRef.cpp (modified) (1 diff)
• API/JSObjectRef.h (modified) (4 diffs)
• API/testapi.c (modified) (3 diffs)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)
• kjs/array_instance.h (modified) (1 diff)
• kjs/array_object.cpp (modified) (2 diffs)
• kjs/nodes.cpp (modified) (1 diff)
• kjs/object.cpp (modified) (2 diffs)
• kjs/object.h (modified) (1 diff)
• kjs/scope_chain.cpp (modified) (2 diffs)
• kjs/scope_chain.h (modified) (1 diff)
• kjs/string_object.cpp (modified) (1 diff)
• kjs/string_object.h (modified) (1 diff)

trunk/JavaScriptCore/API/JSCallbackObject.cpp

@@ -288 +288 @@
 }
 
-void JSCallbackObject::getPropertyList(ExecState* exec, ReferenceList& propertyList, bool recursive)
-{
-    JSContextRef context = toRef(exec);
+void JSCallbackObject::getPropertyList(ReferenceList& propertyList, bool recursive)
+{
     JSObjectRef thisRef = toRef(this);
 
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
         if (JSObjectAddPropertiesToListCallback addPropertiesToList = jsClass->callbacks.addPropertiesToList)
-            addPropertiesToList(context, thisRef, toRef(&propertyList), toRef(exec->exceptionSlot()));
+            addPropertiesToList(thisRef, toRef(&propertyList));
 
         if (__JSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
@@ -320 +319 @@
     }
 
-    JSObject::getPropertyList(exec, propertyList, recursive);
+    JSObject::getPropertyList(propertyList, recursive);
 }
 

trunk/JavaScriptCore/API/JSCallbackObject.h

@@ -61 +61 @@
     virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const List &args);
 
-    virtual void getPropertyList(ExecState*, ReferenceList& propertyList, bool recursive);
+    virtual void getPropertyList(ReferenceList& propertyList, bool recursive);
 
     virtual bool toBoolean(ExecState*) const;

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -272 +272 @@
 };
 
-JSPropertyEnumeratorRef JSObjectCreatePropertyEnumerator(JSContextRef context, JSObjectRef object)
-{
-    JSLock lock;
-    ExecState* exec = toJS(context);
+JSPropertyEnumeratorRef JSObjectCreatePropertyEnumerator(JSObjectRef object)
+{
+    JSLock lock;
     JSObject* jsObject = toJS(object);
     
     JSPropertyEnumeratorRef enumerator = new __JSPropertyEnumerator();
-    jsObject->getPropertyList(exec, enumerator->list);
+    jsObject->getPropertyList(enumerator->list);
     enumerator->iterator = enumerator->list.begin();
     

trunk/JavaScriptCore/API/JSObjectRef.h

@@ -156 +156 @@
 @typedef JSObjectAddPropertiesToListCallback
 @abstract The callback invoked when adding an object's properties to a property list.
-@param context The current execution context.
 @param object The JSObject whose properties need to be added to propertyList.
 @param propertyList A JavaScript property list that will be used to enumerate object's properties.
-@param exception A pointer to a JSValueRef in which to return an exception, if any.
 @discussion If you named your function GetPropertyList, you would declare it like this:
 
-void AddPropertiesToList(JSContextRef context, JSObjectRef object, JSPropertyListRef propertyList, JSValueRef* exception);
+void AddPropertiesToList(JSObjectRef object, JSPropertyListRef propertyList);
 
 Use JSPropertyListAdd to add properties to propertyList.
@@ -169 +167 @@
 */
 typedef void
-(*JSObjectAddPropertiesToListCallback) (JSContextRef context, JSObjectRef object, JSPropertyListRef propertyList, JSValueRef* exception);
+(*JSObjectAddPropertiesToListCallback) (JSObjectRef object, JSPropertyListRef propertyList);
 
 /*! 
@@ -261 +259 @@
 @field setProperty The callback invoked when setting the value of a given property.
 @field deleteProperty The callback invoked when deleting a given property.
-@field getPropertyList The callback invoked when adding an object's properties to a property list.
+@field addPropertiesToList The callback invoked when adding an object's properties to a property list.
 @field callAsFunction The callback invoked when an object is called as a function.
 @field hasInstance The callback invoked when an object is used in an 'instanceof' expression.
@@ -507 +505 @@
 @function
 @abstract Creates an enumerator for an object's properties.
-@param context The execution context to use.
 @param object The object whose properties you want to enumerate.
 @result A JSPropertyEnumerator with a list of object's properties. Ownership follows the Create Rule.
 */
-JSPropertyEnumeratorRef JSObjectCreatePropertyEnumerator(JSContextRef context, JSObjectRef object);
+JSPropertyEnumeratorRef JSObjectCreatePropertyEnumerator(JSObjectRef object);
 /*!
 @function

trunk/JavaScriptCore/API/testapi.c

@@ -163 +163 @@
 }
 
-static void MyObject_getPropertyList(JSContextRef context, JSObjectRef object, JSPropertyListRef propertyList, JSValueRef* exception)
+static void MyObject_addPropertiesToList(JSObjectRef object, JSPropertyListRef propertyList)
 {
     UNUSED_PARAM(context);
@@ -246 +246 @@
     MyObject_setProperty,
     MyObject_deleteProperty,
-    MyObject_getPropertyList,
+    MyObject_addPropertiesToList,
     MyObject_callAsFunction,
     MyObject_callAsConstructor,
@@ -538 +538 @@
     JSObjectSetProperty(context, o, jsOneIString, JSValueMakeNumber(1), kJSPropertyAttributeNone);
     JSObjectSetProperty(context, o, jsCFIString,  JSValueMakeNumber(1), kJSPropertyAttributeDontEnum);
-    JSPropertyEnumeratorRef enumerator = JSObjectCreatePropertyEnumerator(context, o);
+    JSPropertyEnumeratorRef enumerator = JSObjectCreatePropertyEnumerator(o);
     int count = 0;
     while (JSPropertyEnumeratorGetNextName(enumerator))

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-07-12  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Maciej.
+        
+        - Removed context and exception parameters from JSObjectGetPropertyEnumerator,
+        removing the spurious use of ExecState inside JavaScriptCore that made
+        us think this was necessary in the first place.
+
+        (StringInstance::getPropertyList): Use getString instead of toString because
+        we know we're dealing with a string -- we put it there in the first place.
+        While we're at it, store the string's size instead of retrieving it each time 
+        through the loop, to avoid the unnecessary killing of puppies.
+        * kjs/string_object.h:
+
 2006-07-12  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -187 +187 @@
 __ZN3KJS8JSObject14deletePropertyEPNS_9ExecStateERKNS_10IdentifierE
 __ZN3KJS8JSObject14deletePropertyEPNS_9ExecStateEj
-__ZN3KJS8JSObject15getPropertyListEPNS_9ExecStateERNS_13ReferenceListEb
+__ZN3KJS8JSObject15getPropertyListERNS_13ReferenceListEb
 __ZN3KJS8JSObject18getOwnPropertySlotEPNS_9ExecStateEjRNS_12PropertySlotE
 __ZN3KJS8JSObject22fillGetterPropertySlotERNS_12PropertySlotEPPNS_7JSValueE

trunk/JavaScriptCore/kjs/array_instance.h

@@ -40 +40 @@
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
     virtual bool deleteProperty(ExecState *exec, unsigned propertyName);
-    virtual void getPropertyList(ExecState*, ReferenceList& propertyList, bool recursive);
+    virtual void getPropertyList(ReferenceList& propertyList, bool recursive);
 
     virtual void mark();

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -200 +200 @@
 }
 
-void ArrayInstance::getPropertyList(ExecState* exec, ReferenceList& propertyList, bool recursive)
+void ArrayInstance::getPropertyList(ReferenceList& propertyList, bool recursive)
 {
   // avoid fetching this every time through the loop
@@ -212 +212 @@
     }
   }
-  return JSObject::getPropertyList(exec, propertyList, recursive);
+  return JSObject::getPropertyList(propertyList, recursive);
 }
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1879 +1879 @@
   KJS_CHECKEXCEPTION
   v = e->toObject(exec);
-  v->getPropertyList(exec, propertyList);
+  v->getPropertyList(propertyList);
 
   ReferenceListIterator propIt = propertyList.begin();

trunk/JavaScriptCore/kjs/object.cpp

@@ -476 +476 @@
 }
 
-void JSObject::getPropertyList(ExecState *exec, ReferenceList& propertyList, bool recursive)
+void JSObject::getPropertyList(ReferenceList& propertyList, bool recursive)
 {
   _prop.addEnumerablesToReferenceList(propertyList, this);
@@ -494 +494 @@
   }
   if (_proto->isObject() && recursive)
-      static_cast<JSObject*>(_proto)->getPropertyList(exec, propertyList, recursive);
+      static_cast<JSObject*>(_proto)->getPropertyList(propertyList, recursive);
 }
 

trunk/JavaScriptCore/kjs/object.h

@@ -457 +457 @@
      * @return A List of References to properties of the object.
      **/
-    virtual void getPropertyList(ExecState *exec, ReferenceList& propertyList, bool recursive = true);
+    virtual void getPropertyList(ReferenceList& propertyList, bool recursive = true);
 
     /**

trunk/JavaScriptCore/kjs/scope_chain.cpp

@@ -38 +38 @@
 #ifndef NDEBUG
 
-void ScopeChain::print(ExecState* exec)
+void ScopeChain::print()
 {
     ScopeChainIterator scopeEnd = end();
@@ -44 +44 @@
         JSObject* o = *scopeIter;
         ReferenceList propertyList;
-        o->getPropertyList(exec, propertyList, false);
+        o->getPropertyList(propertyList, false);
         ReferenceListIterator propEnd = propertyList.end();
 

trunk/JavaScriptCore/kjs/scope_chain.h

@@ -83 +83 @@
 
 #ifndef NDEBUG        
-        void print(ExecState*);
+        void print();
 #endif
         

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -95 +95 @@
 }
 
-void StringInstance::getPropertyList(ExecState *exec, ReferenceList& propertyList, bool recursive)
+void StringInstance::getPropertyList(ReferenceList& propertyList, bool recursive)
 {
   //### FIXME: should avoid duplicates with prototype
-  UString str = internalValue()->toString(exec);
-  for (int i = 0; i < str.size(); i++)
+  int size = internalValue()->getString().size();
+  for (int i = 0; i < size; i++)
     propertyList.append(Reference(this, i));
-  return JSObject::getPropertyList(exec, propertyList, recursive);
+  return JSObject::getPropertyList(propertyList, recursive);
 }
 

trunk/JavaScriptCore/kjs/string_object.h

@@ -35 +35 @@
     virtual void put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr = None);
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
-    virtual void getPropertyList(ExecState *exec, ReferenceList& propertyList, bool recursive);
+    virtual void getPropertyList(ReferenceList& propertyList, bool recursive);
 
     virtual const ClassInfo *classInfo() const { return &info; }