Changeset 61860 in webkit

Timestamp:

Jun 25, 2010 6:39:17 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Simon Hausmann.

New QtScript API; setPrototype() and prototype().

This patch implements QScriptValue's prototype accessors.

[Qt] QScriptValue should have accessors to a prototype.
​https://bugs.webkit.org/show_bug.cgi?id=39356

• qt/api/qscriptvalue.cpp: (QScriptValue::prototype): (QScriptValue::setPrototype):
• qt/api/qscriptvalue.h:
• qt/api/qscriptvalue_p.h: (QScriptValuePrivate::prototype): (QScriptValuePrivate::setPrototype):
• qt/tests/qscriptvalue/tst_qscriptvalue.cpp: (tst_QScriptValue::getSetPrototype):
• qt/tests/qscriptvalue/tst_qscriptvalue.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• qt/api/qscriptvalue.cpp (modified) (1 diff)
• qt/api/qscriptvalue.h (modified) (1 diff)
• qt/api/qscriptvalue_p.h (modified) (3 diffs)
• qt/tests/qscriptvalue/tst_qscriptvalue.cpp (modified) (1 diff)
• qt/tests/qscriptvalue/tst_qscriptvalue.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-06-25  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        New QtScript API; setPrototype() and prototype().
+
+        This patch implements QScriptValue's prototype accessors.
+
+        [Qt] QScriptValue should have accessors to a prototype.
+        https://bugs.webkit.org/show_bug.cgi?id=39356
+
+        * qt/api/qscriptvalue.cpp:
+        (QScriptValue::prototype):
+        (QScriptValue::setPrototype):
+        * qt/api/qscriptvalue.h:
+        * qt/api/qscriptvalue_p.h:
+        (QScriptValuePrivate::prototype):
+        (QScriptValuePrivate::setPrototype):
+        * qt/tests/qscriptvalue/tst_qscriptvalue.cpp:
+        (tst_QScriptValue::getSetPrototype):
+        * qt/tests/qscriptvalue/tst_qscriptvalue.h:
+
 2010-06-25  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 

trunk/JavaScriptCore/qt/api/qscriptvalue.cpp

@@ -516 +516 @@
         return QScriptEnginePrivate::get(engine);
     return 0;
+}
+
+/*!
+  If this QScriptValue is an object, returns the internal prototype
+  (\c{__proto__} property) of this object; otherwise returns an
+  invalid QScriptValue.
+
+  \sa setPrototype(), isObject()
+*/
+QScriptValue QScriptValue::prototype() const
+{
+    return QScriptValuePrivate::get(d_ptr->prototype());
+}
+
+/*!
+  If this QScriptValue is an object, sets the internal prototype
+  (\c{__proto__} property) of this object to be \a prototype;
+  otherwise does nothing.
+
+  The internal prototype should not be confused with the public
+  property with name "prototype"; the public prototype is usually
+  only set on functions that act as constructors.
+
+  \sa prototype(), isObject()
+*/
+void QScriptValue::setPrototype(const QScriptValue& prototype)
+{
+    d_ptr->setPrototype(QScriptValuePrivate::get(prototype));
 }
 

trunk/JavaScriptCore/qt/api/qscriptvalue.h

@@ -60 +60 @@
 
     QScriptValue& operator=(const QScriptValue& other);
+
+    QScriptValue prototype() const;
+    void setPrototype(const QScriptValue& prototype);
+
     bool equals(const QScriptValue& other) const;
     bool strictlyEquals(const QScriptValue& other) const;

trunk/JavaScriptCore/qt/api/qscriptvalue_p.h

@@ -26 +26 @@
 #include <JavaScriptCore/JavaScript.h>
 #include <JavaScriptCore/JSRetainPtr.h>
+#include <JSObjectRefPrivate.h>
 #include <QtCore/qmath.h>
 #include <QtCore/qnumeric.h>
@@ -109 +110 @@
     inline quint32 toUInt32() const;
     inline quint16 toUInt16() const;
+
     inline QScriptValuePrivate* toObject(QScriptEnginePrivate* engine);
     inline QScriptValuePrivate* toObject();
+    inline QScriptValuePrivate* prototype();
+    inline void setPrototype(QScriptValuePrivate* prototype);
 
     inline bool equals(QScriptValuePrivate* other);
@@ -610 +614 @@
 }
 
+inline QScriptValuePrivate* QScriptValuePrivate::prototype()
+{
+    if (isObject()) {
+        JSValueRef prototype = JSObjectGetPrototype(*m_engine, *this);
+        if (JSValueIsNull(*m_engine, prototype))
+            return new QScriptValuePrivate(engine(), prototype);
+        // The prototype could be either a null or a JSObject, so it is safe to cast the prototype
+        // to the JSObjectRef here.
+        return new QScriptValuePrivate(engine(), prototype, const_cast<JSObjectRef>(prototype));
+    }
+    return new QScriptValuePrivate;
+}
+
+inline void QScriptValuePrivate::setPrototype(QScriptValuePrivate* prototype)
+{
+    if (isObject() && prototype->isValid() && (prototype->isObject() || prototype->isNull())) {
+        if (engine() != prototype->engine()) {
+            qWarning("QScriptValue::setPrototype() failed: cannot set a prototype created in a different engine");
+            return;
+        }
+        // FIXME: This could be replaced by a new, faster API
+        // look at https://bugs.webkit.org/show_bug.cgi?id=40060
+        JSObjectSetPrototype(*m_engine, *this, *prototype);
+        JSValueRef proto = JSObjectGetPrototype(*m_engine, *this);
+        if (!JSValueIsStrictEqual(*m_engine, proto, *prototype))
+            qWarning("QScriptValue::setPrototype() failed: cyclic prototype value");
+    }
+}
+
 bool QScriptValuePrivate::equals(QScriptValuePrivate* other)
 {

trunk/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue.cpp

@@ -430 +430 @@
 
     QVERIFY(incr.call().isValid()); // Exception.
+}
+
+void tst_QScriptValue::getSetPrototype()
+{
+    QScriptEngine engine;
+    QScriptValue object = engine.evaluate("new Object()");
+    QScriptValue object2 = engine.evaluate("new Object()");
+    object2.setPrototype(object);
+    QCOMPARE(object2.prototype().strictlyEquals(object), true);
+
+    QScriptValue inv;
+    inv.setPrototype(object);
+    QCOMPARE(inv.prototype().isValid(), false);
+
+    QScriptEngine otherEngine;
+    QScriptValue object3 = otherEngine.evaluate("new Object()");
+    QTest::ignoreMessage(QtWarningMsg, "QScriptValue::setPrototype() failed: cannot set a prototype created in a different engine");
+    object2.setPrototype(object3);
+    QCOMPARE(object2.prototype().strictlyEquals(object), true);
+
+    // cyclic prototypes
+    {
+        QScriptValue ret = engine.evaluate("o = { }; p = { }; o.__proto__ = p; p.__proto__ = o");
+        QCOMPARE(ret.isError(), true);
+        QCOMPARE(ret.toString(), QLatin1String("Error: cyclic __proto__ value"));
+    }
+    {
+        QScriptValue ret = engine.evaluate("p.__proto__ = { }");
+        QCOMPARE(ret.isError(), false);
+    }
+
+    QScriptValue old = object.prototype();
+    QTest::ignoreMessage(QtWarningMsg, "QScriptValue::setPrototype() failed: cyclic prototype value");
+    object.setPrototype(object);
+    QCOMPARE(object.prototype().strictlyEquals(old), true);
+
+    object2.setPrototype(object);
+    QTest::ignoreMessage(QtWarningMsg, "QScriptValue::setPrototype() failed: cyclic prototype value");
+    object.setPrototype(object2);
+    QCOMPARE(object.prototype().strictlyEquals(old), true);
 }
 

trunk/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue.h

@@ -48 +48 @@
     void constructors_data();
     void constructors();
+    void getSetPrototype();
     void call();
     void ctor();