Changeset 34868 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jun 28, 2008, 10:38:37 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-06-28 Darin Adler <Darin Adler>

Reviewed by Sam and Cameron.

• fix ​https://bugs.webkit.org/show_bug.cgi?id=19805 Array.concat turns missing array elements into "undefined"

Test: fast/js/array-holes.html

• JavaScriptCore.exp: No longer export JSArray::getItem.

• kjs/ArrayPrototype.cpp: (KJS::arrayProtoFuncConcat): Changed to use getProperty instead of JSArray::getItem -- need to handle properties from the prototype chain instead of ignoring them.

• kjs/JSArray.cpp: Removed getItem.
• kjs/JSArray.h: Ditto.

WebCore:

2008-06-28 Darin Adler <Darin Adler>

Reviewed by Sam and Cameron.

• fix ​https://bugs.webkit.org/show_bug.cgi?id=19805 Array.concat turns missing array elements into "undefined"

• bridge/jni/jni_utility.cpp: (KJS::Bindings::convertArrayInstanceToJavaArray): Use get instead of getItem, since we always want to consider values from the prototypes when looking at JavaScript arrays.

LayoutTests:

2008-06-28 Darin Adler <Darin Adler>

Reviewed by Sam and Cameron.

• test for ​https://bugs.webkit.org/show_bug.cgi?id=19805 Array.concat turns missing array elements into "undefined"

• fast/js/array-holes-expected.txt: Added.
• fast/js/array-holes.html: Added.
• fast/js/resources/array-holes.js: Added.

Location:

trunk/JavaScriptCore/kjs

Files:

• ArrayPrototype.cpp (modified) (1 diff)
• JSArray.cpp (modified) (1 diff)
• JSArray.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/ArrayPrototype.cpp

@@ -267 +267 @@
             unsigned length = curArray->getLength();
             for (unsigned k = 0; k < length; ++k) {
-                if (JSValue* v = curArray->getItem(k))
+                if (JSValue* v = getProperty(exec, curArray, k))
                     arr->put(exec, n, v);
                 n++;

trunk/JavaScriptCore/kjs/JSArray.cpp

@@ -132 +132 @@
 }
 
-JSValue* JSArray::getItem(unsigned i) const
-{
-    ASSERT(i <= maxArrayIndex);
-
-    ArrayStorage* storage = m_storage;
-
-    if (i < storage->m_vectorLength) {
-        JSValue* value = storage->m_vector[i];
-        return value ? value : jsUndefined();
-    }
-
-    SparseArrayValueMap* map = storage->m_sparseValueMap;
-    if (!map)
-        return jsUndefined();
-
-    JSValue* value = map->get(i);
-    return value ? value : jsUndefined();
-}
-
 JSValue* JSArray::lengthGetter(ExecState* exec, const Identifier&, const PropertySlot& slot)
 {

trunk/JavaScriptCore/kjs/JSArray.h

@@ -43 +43 @@
     unsigned getLength() const { return m_length; }
     void setLength(unsigned); // OK to use on new arrays, but not if it might be a RegExpMatchArray.
-    JSValue* getItem(unsigned) const;
 
     void sort(ExecState*);
@@ -59 +58 @@
 
   private:
-    using JSObject::get;
-
     virtual const ClassInfo* classInfo() const { return &info; }