Changeset 62547 in webkit for trunk/JavaScriptCore/qt/api/qscriptvalue.h

Timestamp:

Jul 6, 2010, 6:55:34 AM (15 years ago)

Author:

[email protected]

Message:

2010-07-06 Jedrzej Nowacki <​[email protected]>

Reviewed by Kenneth Rohde Christiansen.

Implementation of QScriptValue properties accessors.

The patch contains implementation of the QScriptValue::property() and
the QScriptValue::setProperty(). It is not full functionality, as these
method are too complex for one patch, but it is enough to cover about
95% of use cases.

Missing functionality:

• Few of the PropertyFlags are ignored.
• Only a public part of the ResolveFlags can be used (ResolveLocal, ResolvePrototype).

A lot of new test cases were added.

[Qt] QScriptValue should have API for accessing object properties
​https://bugs.webkit.org/show_bug.cgi?id=40903

• api/qscriptconverter_p.h: (QScriptConverter::toPropertyFlags):
• api/qscriptstring_p.h: (QScriptStringPrivate::operator JSStringRef):
• api/qscriptvalue.cpp: (QScriptValue::property): (QScriptValue::setProperty):
• api/qscriptvalue.h: (QScriptValue::):
• api/qscriptvalue_p.h: (QScriptValuePrivate::assignEngine): (QScriptValuePrivate::property): (QScriptValuePrivate::hasOwnProperty): (QScriptValuePrivate::setProperty): (QScriptValuePrivate::deleteProperty):
• tests/qscriptvalue/tst_qscriptvalue.cpp: (tst_QScriptValue::getPropertySimple_data): (tst_QScriptValue::getPropertySimple): (tst_QScriptValue::setPropertySimple): (tst_QScriptValue::getPropertyResolveFlag): (tst_QScriptValue::getSetProperty): (tst_QScriptValue::setProperty_data): (tst_QScriptValue::setProperty):
• tests/qscriptvalue/tst_qscriptvalue.h:

File:

• trunk/JavaScriptCore/qt/api/qscriptvalue.h (modified) (4 diffs)

trunk/JavaScriptCore/qt/api/qscriptvalue.h

@@ -21 +21 @@
 #define qscriptvalue_h
 
+#include "qscriptstring.h"
 #include <QtCore/qlist.h>
 #include <QtCore/qshareddata.h>
@@ -35 +36 @@
 public:
     enum ResolveFlag {
-        ResolveLocal     = 0x00,
-        ResolvePrototype = 0x01
+        ResolveLocal        = 0x00,
+        ResolvePrototype    = 0x01,
+        ResolveScope        = 0x02,
+        ResolveFull         = ResolvePrototype | ResolveScope
     };
+    Q_DECLARE_FLAGS(ResolveFlags, ResolveFlag)
 
-    Q_DECLARE_FLAGS(ResolveFlags, ResolveFlag)
+    enum PropertyFlag {
+        ReadOnly            = 0x00000001,
+        Undeletable         = 0x00000002,
+        SkipInEnumeration   = 0x00000004,
+        PropertyGetter      = 0x00000008,
+        PropertySetter      = 0x00000010,
+        QObjectMember       = 0x00000020,
+        KeepExistingFlags   = 0x00000800,
+        UserRange           = 0xff000000 // Users may use these as they see fit.
+    };
+    Q_DECLARE_FLAGS(PropertyFlags, PropertyFlag)
 
     enum SpecialValue {
@@ -76 +90 @@
 
     QScriptValue property(const QString& name, const ResolveFlags& mode = ResolvePrototype) const;
+    QScriptValue property(const QScriptString& name, const ResolveFlags& mode = ResolvePrototype) const;
     QScriptValue property(quint32 arrayIndex, const ResolveFlags& mode = ResolvePrototype) const;
+
+    void setProperty(const QString& name, const QScriptValue& value, const PropertyFlags& flags = KeepExistingFlags);
+    void setProperty(quint32 arrayIndex, const QScriptValue& value, const PropertyFlags& flags = KeepExistingFlags);
+    void setProperty(const QScriptString& name, const QScriptValue& value, const PropertyFlags& flags = KeepExistingFlags);
 
     QScriptEngine* engine() const;
@@ -103 +122 @@
     QScriptValue call(const QScriptValue& thisObject = QScriptValue(),
                       const QScriptValueList& args = QScriptValueList());
-
 private:
     QScriptValue(void*);