Show
Ignore:
Timestamp:
08/18/08 11:14:49 (5 months ago)
Author:
odole
Message:

merge with webkit revision 35814

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/kjs/JSArray.h

    r414 r440  
    3030 
    3131    struct ArrayStorage { 
     32        unsigned m_length; 
    3233        unsigned m_vectorLength; 
    3334        unsigned m_numValuesInVector; 
    …… 
    4950        static const ClassInfo info; 
    5051 
    51         unsigned getLength() const { return m_length; } 
     52        unsigned length() const { return m_storage->m_length; } 
    5253        void setLength(unsigned); // OK to use on new arrays, but not if it might be a RegExpMatchArray. 
    5354 
    …… 
    8283        virtual const ClassInfo* classInfo() const { return &info; } 
    8384 
    84         static JSValue* lengthGetter(ExecState*, const Identifier&, const PropertySlot&); 
    85  
    8685        bool getOwnPropertySlotSlowCase(ExecState*, unsigned propertyName, PropertySlot&); 
    8786        void putSlowCase(ExecState*, unsigned propertyName, JSValue*); 
    …… 
    9493        void checkConsistency(ConsistencyCheckType = NormalConsistencyCheck); 
    9594 
    96         unsigned m_length; 
    9795        unsigned m_fastAccessCutoff; 
    9896        ArrayStorage* m_storage;