Changeset 60583 in webkit

Timestamp:

Jun 2, 2010 5:27:42 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-02 Jedrzej Nowacki <​jedrzej.nowacki@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

New function QScriptEngine::newObject.

The function creates a object of class Object and returns it
as a QScriptValue.

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

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

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-02  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        New function QScriptEngine::newObject.
+
+        The function creates a object of class Object and returns it
+        as a QScriptValue.
+
+        [Qt] QScriptEngine API should contain a newObject function
+        https://bugs.webkit.org/show_bug.cgi?id=39114
+
+        * qt/api/qscriptengine.cpp:
+        (QScriptEngine::newObject):
+        * qt/api/qscriptengine.h:
+        * qt/api/qscriptengine_p.cpp:
+        (QScriptEnginePrivate::newObject):
+        * qt/api/qscriptengine_p.h:
+        * qt/tests/qscriptengine/tst_qscriptengine.cpp:
+        (tst_QScriptEngine::newObject):
+
 2010-06-02  Gabor Loki  <loki@webkit.org>
 

trunk/JavaScriptCore/qt/api/qscriptengine.cpp

@@ -194 +194 @@
 
 /*!
+  Creates a QtScript object of class Object.
+
+  The prototype of the created object will be the Object
+  prototype object.
+
+  \sa newArray(), QScriptValue::setProperty()
+*/
+QScriptValue QScriptEngine::newObject()
+{
+    return QScriptValuePrivate::get(d_ptr->newObject());
+}
+
+/*!
   Returns this engine's Global Object.
 

trunk/JavaScriptCore/qt/api/qscriptengine.h

@@ -51 +51 @@
     QScriptValue nullValue();
     QScriptValue undefinedValue();
+    QScriptValue newObject();
     QScriptValue globalObject() const;
 private:

trunk/JavaScriptCore/qt/api/qscriptengine_p.cpp

@@ -78 +78 @@
 }
 
+QScriptValuePrivate* QScriptEnginePrivate::newObject() const
+{
+    return new QScriptValuePrivate(this, JSObjectMake(context(), /* jsClass */ 0, /* userData */ 0));
+}
+
 QScriptValuePrivate* QScriptEnginePrivate::globalObject() const
 {

trunk/JavaScriptCore/qt/api/qscriptengine_p.h

@@ -57 +57 @@
     inline JSValueRef makeJSValue(QScriptValue::SpecialValue value) const;
 
+    QScriptValuePrivate* newObject() const;
     QScriptValuePrivate* globalObject() const;
 

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

@@ -36 +36 @@
 
 private slots:
+    void newObject();
     void globalObject();
     void evaluate();
@@ -55 +56 @@
     QVERIFY2(engine.evaluate("1+1").isValid(), "the expression should be evaluated and an valid result should be returned");
     QVERIFY2(engine.evaluate("ping").isValid(), "Script throwing an unhandled exception should return an exception value");
+}
+
+void tst_QScriptEngine::newObject()
+{
+    QScriptEngine engine;
+    QScriptValue object = engine.newObject();
+    QVERIFY(object.isObject());
+    QVERIFY(object.engine() == &engine);
+    QVERIFY(!object.isError());
+    QVERIFY(!object.equals(engine.newObject()));
+    QVERIFY(!object.strictlyEquals(engine.newObject()));
+    QCOMPARE(object.toString(), QString::fromAscii("[object Object]"));
 }