Changeset 62661 in webkit

Timestamp:

Jul 7, 2010 7:10:50 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-07 Caio Marcelo de Oliveira Filho <​caio.oliveira@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Implementation of QScriptValue::isArray()
​https://bugs.webkit.org/show_bug.cgi?id=41713

Since we don't have access to the Class? internal property of
builtins (including Array), the solution was to keep the original 'Array'
(constructor) and 'Array.prototype' objects and use them to identify
if a given object is an Array.

Also uncomment some tests and add some tests of newArray() that
depended on isArray().

• api/qscriptengine_p.cpp: (QScriptEnginePrivate::QScriptEnginePrivate): (QScriptEnginePrivate::~QScriptEnginePrivate):
• api/qscriptengine_p.h: (QScriptEnginePrivate::isArray):
• api/qscriptvalue.cpp: (QScriptValue::isArray):
• api/qscriptvalue.h:
• api/qscriptvalue_p.h: (QScriptValuePrivate::isArray):
• tests/qscriptengine/tst_qscriptengine.cpp: (tst_QScriptEngine::newArray):

Location:

trunk/JavaScriptCore/qt

Files:

• ChangeLog (modified) (1 diff)
• api/qscriptengine_p.cpp (modified) (1 diff)
• api/qscriptengine_p.h (modified) (2 diffs)
• api/qscriptvalue.cpp (modified) (1 diff)
• api/qscriptvalue.h (modified) (1 diff)
• api/qscriptvalue_p.h (modified) (2 diffs)
• tests/qscriptengine/tst_qscriptengine.cpp (modified) (2 diffs)

trunk/JavaScriptCore/qt/ChangeLog

@@ +1 @@
+2010-07-07  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Implementation of QScriptValue::isArray()
+        https://bugs.webkit.org/show_bug.cgi?id=41713
+
+        Since we don't have access to the [[Class]] internal property of
+        builtins (including Array), the solution was to keep the original 'Array'
+        (constructor) and 'Array.prototype' objects and use them to identify
+        if a given object is an Array.
+
+        Also uncomment some tests and add some tests of newArray() that
+        depended on isArray(). 
+
+        * api/qscriptengine_p.cpp:
+        (QScriptEnginePrivate::QScriptEnginePrivate):
+        (QScriptEnginePrivate::~QScriptEnginePrivate):
+        * api/qscriptengine_p.h:
+        (QScriptEnginePrivate::isArray):
+        * api/qscriptvalue.cpp:
+        (QScriptValue::isArray):
+        * api/qscriptvalue.h:
+        * api/qscriptvalue_p.h:
+        (QScriptValuePrivate::isArray):
+        * tests/qscriptengine/tst_qscriptengine.cpp:
+        (tst_QScriptEngine::newArray):
+
 2010-07-06  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
 

trunk/JavaScriptCore/qt/api/qscriptengine_p.cpp

@@ -33 +33 @@
     , m_context(JSGlobalContextCreate(0))
     , m_exception(0)
+    , m_arrayConstructor(0)
+    , m_arrayPrototype(0)
 {
+    JSObjectRef globalObject = JSContextGetGlobalObject(m_context);
+
+    // Save references to the Array constructor and prototype.
+    JSRetainPtr<JSStringRef> arrayName(Adopt, JSStringCreateWithUTF8CString("Array"));
+    JSValueRef arrayConstructor = JSObjectGetProperty(m_context, globalObject, arrayName.get(), /* exception */ 0);
+    Q_ASSERT(JSValueIsObject(m_context, arrayConstructor));
+    m_arrayConstructor = JSValueToObject(m_context, arrayConstructor, /* exception */ 0);
+    JSValueProtect(m_context, m_arrayConstructor);
+
+    // Note that this is not the [[Prototype]] internal property (which we could
+    // get via JSObjectGetPrototype), but the Array.prototype, that will be set
+    // as [[Prototype]] of Array instances.
+    JSRetainPtr<JSStringRef> prototypeName(Adopt, JSStringCreateWithUTF8CString("prototype"));
+    JSValueRef arrayPrototype = JSObjectGetProperty(m_context, m_arrayConstructor, prototypeName.get(), /* exception */ 0);
+    Q_ASSERT(JSValueIsObject(m_context, arrayPrototype));
+    m_arrayPrototype = arrayPrototype;
+    JSValueProtect(m_context, m_arrayPrototype);
 }
 
 QScriptEnginePrivate::~QScriptEnginePrivate()
 {
+    JSValueUnprotect(m_context, m_arrayConstructor);
+    JSValueUnprotect(m_context, m_arrayPrototype);
     if (m_exception)
         JSValueUnprotect(m_context, m_exception);

trunk/JavaScriptCore/qt/api/qscriptengine_p.h

@@ -78 +78 @@
 
     inline operator JSGlobalContextRef() const;
+
+    inline bool isArray(JSValueRef value) const;
 private:
     QScriptEngine* q_ptr;
     JSGlobalContextRef m_context;
     JSValueRef m_exception;
+
+    JSObjectRef m_arrayConstructor;
+    JSValueRef m_arrayPrototype;
 };
 
@@ -212 +217 @@
 }
 
+bool QScriptEnginePrivate::isArray(JSValueRef value) const
+{
+    // JSC API doesn't export the [[Class]] information for the builtins. But we know that a value
+    // is an array if it was created with the Array constructor or if it is the Array.prototype.
+    return JSValueIsInstanceOfConstructor(m_context, value, m_arrayConstructor, /* exception */ 0) || JSValueIsStrictEqual(m_context, value, m_arrayPrototype);
+}
+
 #endif

trunk/JavaScriptCore/qt/api/qscriptvalue.cpp

@@ -311 +311 @@
 {
     return d_ptr->isError();
+}
+
+/*!
+  Returns true if this QScriptValue is an object of the Array class;
+  otherwise returns false.
+
+  \sa QScriptEngine::newArray()
+*/
+bool QScriptValue::isArray() const
+{
+    return d_ptr->isArray();
 }
 

trunk/JavaScriptCore/qt/api/qscriptvalue.h

@@ -109 +109 @@
     bool isObject() const;
     bool isError() const;
+    bool isArray() const;
 
     QString toString() const;

trunk/JavaScriptCore/qt/api/qscriptvalue_p.h

@@ -102 +102 @@
     inline bool isObject();
     inline bool isFunction();
+    inline bool isArray();
 
     inline QString toString() const;
@@ -445 +446 @@
 }
 
+bool QScriptValuePrivate::isArray()
+{
+    switch (m_state) {
+    case JSValue:
+        if (refinedJSValue() != JSObject)
+            return false;
+        // Fall-through.
+    case JSObject:
+        return m_engine->isArray(*this);
+    default:
+        return false;
+    }
+}
+
 QString QScriptValuePrivate::toString() const
 {

trunk/JavaScriptCore/qt/tests/qscriptengine/tst_qscriptengine.cpp

@@ -417 +417 @@
     QScriptValue array = eng.newArray();
     QCOMPARE(array.isValid(), true);
-    // QCOMPARE(array.isArray(), true);
+    QCOMPARE(array.isArray(), true);
     QCOMPARE(array.isObject(), true);
     QVERIFY(!array.isFunction());
@@ -424 +424 @@
     // Prototype should be Array.prototype.
     QCOMPARE(array.prototype().isValid(), true);
-    // QCOMPARE(array.prototype().isArray(), true);
+    QCOMPARE(array.prototype().isArray(), true);
     QCOMPARE(array.prototype().strictlyEquals(eng.evaluate("Array.prototype")), true);
 
     QScriptValue arrayWithSize = eng.newArray(42);
     QCOMPARE(arrayWithSize.isValid(), true);
-    // QCOMPARE(arrayWithSize.isArray(), true);
+    QCOMPARE(arrayWithSize.isArray(), true);
     QCOMPARE(arrayWithSize.isObject(), true);
     QCOMPARE(arrayWithSize.property("length").toInt32(), 42);
+
+    // task 218092
+    {
+        QScriptValue ret = eng.evaluate("[].splice(0, 0, 'a')");
+        QVERIFY(ret.isArray());
+        QCOMPARE(ret.property("length").toInt32(), 0);
+    }
+    {
+        QScriptValue ret = eng.evaluate("['a'].splice(0, 1, 'b')");
+        QVERIFY(ret.isArray());
+        QCOMPARE(ret.property("length").toInt32(), 1);
+    }
+    {
+        QScriptValue ret = eng.evaluate("['a', 'b'].splice(0, 1, 'c')");
+        QVERIFY(ret.isArray());
+        QCOMPARE(ret.property("length").toInt32(), 1);
+    }
+    {
+        QScriptValue ret = eng.evaluate("['a', 'b', 'c'].splice(0, 2, 'd')");
+        QVERIFY(ret.isArray());
+        QCOMPARE(ret.property("length").toInt32(), 2);
+    }
+    {
+        QScriptValue ret = eng.evaluate("['a', 'b', 'c'].splice(1, 2, 'd', 'e', 'f')");
+        QVERIFY(ret.isArray());
+        QCOMPARE(ret.property("length").toInt32(), 2);
+    }
 }