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/ArrayPrototype.cpp

    r414 r440  
    3434 
    3535namespace KJS { 
     36 
     37ASSERT_CLASS_FITS_IN_CELL(ArrayPrototype); 
    3638 
    3739static JSValue* arrayProtoFuncToString(ExecState*, JSObject*, JSValue*, const ArgList&); 
     
    263265        if (curArg->isObject(&JSArray::info)) { 
    264266            JSArray* curArray = static_cast<JSArray*>(curArg); 
    265             unsigned length = curArray->getLength(); 
     267            unsigned length = curArray->length(); 
    266268            for (unsigned k = 0; k < length; ++k) { 
    267269                if (JSValue* v = getProperty(exec, curArray, k))