Changeset 62078 in webkit

Timestamp:

Jun 28, 2010 8:04:36 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Kenneth Rohde Christiansen.

[Qt] QScriptEngine API should contain a newArray function
​https://bugs.webkit.org/show_bug.cgi?id=39115

• qt/api/qscriptengine.cpp: (QScriptEngine::newArray):
• qt/api/qscriptengine.h:
• qt/api/qscriptengine_p.cpp: (QScriptEnginePrivate::newArray):
• qt/api/qscriptengine_p.h:
• qt/tests/qscriptengine/tst_qscriptengine.cpp: (tst_QScriptEngine::newArray):

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-06-28  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QScriptEngine API should contain a newArray function
+        https://bugs.webkit.org/show_bug.cgi?id=39115
+
+        * qt/api/qscriptengine.cpp:
+        (QScriptEngine::newArray):
+        * qt/api/qscriptengine.h:
+        * qt/api/qscriptengine_p.cpp:
+        (QScriptEnginePrivate::newArray):
+        * qt/api/qscriptengine_p.h:
+        * qt/tests/qscriptengine/tst_qscriptengine.cpp:
+        (tst_QScriptEngine::newArray):
+
 2010-06-28  Xan Lopez  <xlopez@igalia.com>
 

trunk/JavaScriptCore/qt/api/qscriptengine.cpp

@@ -207 +207 @@
 
 /*!
+  Creates a QtScript object of class Array with the given \a length.
+
+  \sa newObject()
+*/
+QScriptValue QScriptEngine::newArray(uint length)
+{
+    return QScriptValuePrivate::get(d_ptr->newArray(length));
+}
+
+/*!
   Returns this engine's Global Object.
 

trunk/JavaScriptCore/qt/api/qscriptengine.h

@@ -52 +52 @@
     QScriptValue undefinedValue();
     QScriptValue newObject();
+    QScriptValue newArray(uint length = 0);
     QScriptValue globalObject() const;
 private:

trunk/JavaScriptCore/qt/api/qscriptengine_p.cpp

@@ -83 +83 @@
 }
 
+QScriptValuePrivate* QScriptEnginePrivate::newArray(uint length) const
+{
+    JSObjectRef array = JSObjectMakeArray(m_context, /* argumentCount */ 0, /* arguments */ 0, /* exception */ 0);
+
+    if (length > 0) {
+        JSRetainPtr<JSStringRef> lengthRef(Adopt, JSStringCreateWithUTF8CString("length"));
+        JSObjectSetProperty(m_context, array, lengthRef.get(), JSValueMakeNumber(m_context, length), kJSPropertyAttributeNone, /* exception */ 0);
+    }
+
+    return new QScriptValuePrivate(this, array);
+}
+
 QScriptValuePrivate* QScriptEnginePrivate::globalObject() const
 {

trunk/JavaScriptCore/qt/api/qscriptengine_p.h

@@ -58 +58 @@
 
     QScriptValuePrivate* newObject() const;
+    QScriptValuePrivate* newArray(uint length) const;
     QScriptValuePrivate* globalObject() const;
 

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

@@ -48 +48 @@
     void toObject();
     void toObjectTwoEngines();
+    void newArray();
 };
 
@@ -410 +411 @@
 }
 
+void tst_QScriptEngine::newArray()
+{
+    QScriptEngine eng;
+    QScriptValue array = eng.newArray();
+    QCOMPARE(array.isValid(), true);
+    // QCOMPARE(array.isArray(), true);
+    QCOMPARE(array.isObject(), true);
+    QVERIFY(!array.isFunction());
+    // QCOMPARE(array.scriptClass(), (QScriptClass*)0);
+
+    // Prototype should be Array.prototype.
+    QCOMPARE(array.prototype().isValid(), 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.isObject(), true);
+    QCOMPARE(arrayWithSize.property("length").toInt32(), 42);
+}
+
 QTEST_MAIN(tst_QScriptEngine)
 #include "tst_qscriptengine.moc"