JavaScriptCore-576.tar.gz

[apple/javascriptcore.git] / runtime / JSVariableObject.h

diff --git a/runtime/JSVariableObject.h b/runtime/JSVariableObject.h
index b969da5e48bddcf031c09fee10a54f744e9df92e..6c679ce0720c58597f29d6bd10bf0ba9f9be0202 100644 (file)
--- a/runtime/JSVariableObject.h
+++ b/runtime/JSVariableObject.h
@@ -49,16 +49,20 @@ namespace JSC {
         virtual void putWithAttributes(ExecState*, const Identifier&, JSValue, unsigned attributes) = 0;
 
         virtual bool deleteProperty(ExecState*, const Identifier&);
         virtual void putWithAttributes(ExecState*, const Identifier&, JSValue, unsigned attributes) = 0;
 
         virtual bool deleteProperty(ExecState*, const Identifier&);

-        virtual void getPropertyNames(ExecState*, PropertyNameArray&);
+        virtual void getOwnPropertyNames(ExecState*, PropertyNameArray&, EnumerationMode mode = ExcludeDontEnumProperties);

         
         virtual bool isVariableObject() const;
         virtual bool isDynamicScope() const = 0;
 
         
         virtual bool isVariableObject() const;
         virtual bool isDynamicScope() const = 0;
 

-        virtual bool getPropertyAttributes(ExecState*, const Identifier& propertyName, unsigned& attributes) const;
-

         Register& registerAt(int index) const { return d->registers[index]; }
 
         Register& registerAt(int index) const { return d->registers[index]; }
 

+        static PassRefPtr<Structure> createStructure(JSValue prototype)
+        {
+            return Structure::create(prototype, TypeInfo(ObjectType, StructureFlags), AnonymousSlotCount);
+        }
+        

     protected:
     protected:

+        static const unsigned StructureFlags = OverridesGetPropertyNames | JSObject::StructureFlags;

         // Subclasses of JSVariableObject can subclass this struct to add data
         // without increasing their own size (since there's a hard limit on the
         // size of a JSCell).
         // Subclasses of JSVariableObject can subclass this struct to add data
         // without increasing their own size (since there's a hard limit on the
         // size of a JSCell).


@@ -79,7 +83,7 @@ namespace JSC {
             JSVariableObjectData& operator=(const JSVariableObjectData&);
         };
 
             JSVariableObjectData& operator=(const JSVariableObjectData&);
         };
 

-        JSVariableObject(PassRefPtr<Structure> structure, JSVariableObjectData* data)
+        JSVariableObject(NonNullPassRefPtr<Structure> structure, JSVariableObjectData* data)

             : JSObject(structure)
             , d(data) // Subclass owns this pointer.
         {
             : JSObject(structure)
             , d(data) // Subclass owns this pointer.
         {


@@ -89,6 +93,7 @@ namespace JSC {
         void setRegisters(Register* r, Register* registerArray);
 
         bool symbolTableGet(const Identifier&, PropertySlot&);
         void setRegisters(Register* r, Register* registerArray);
 
         bool symbolTableGet(const Identifier&, PropertySlot&);

+        bool symbolTableGet(const Identifier&, PropertyDescriptor&);

         bool symbolTableGet(const Identifier&, PropertySlot&, bool& slotIsWriteable);
         bool symbolTablePut(const Identifier&, JSValue);
         bool symbolTablePutWithAttributes(const Identifier&, JSValue, unsigned attributes);
         bool symbolTableGet(const Identifier&, PropertySlot&, bool& slotIsWriteable);
         bool symbolTablePut(const Identifier&, JSValue);
         bool symbolTablePutWithAttributes(const Identifier&, JSValue, unsigned attributes);