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

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.cpp (modified) (2 diffs)

trunk/JavaScriptCore/qt/api/qscriptvalue.cpp

@@ -652 +652 @@
   \overload
 
+  Returns the value of this QScriptValue's property with the given \a name,
+  using the given \a mode to resolve the property.
+
+  This overload of property() is useful when you need to look up the
+  same property repeatedly, since the lookup can be performed faster
+  when the name is represented as an interned string.
+
+  \sa QScriptEngine::toStringHandle(), setProperty()
+*/
+QScriptValue QScriptValue::property(const QScriptString& name, const ResolveFlags& mode) const
+{
+    return QScriptValuePrivate::get(d_ptr->property(QScriptStringPrivate::get(name).constData(), mode));
+}
+
+/*!
+  \overload
+
   Returns the property at the given \a arrayIndex, using the given \a
   mode to resolve the property.
@@ -666 +683 @@
     return QScriptValuePrivate::get(d_ptr->property(arrayIndex, mode));
 }
+
+/*!
+  Sets the value of this QScriptValue's property with the given \a name to
+  the given \a value.
+
+  If this QScriptValue is not an object, this function does nothing.
+
+  If this QScriptValue does not already have a property with name \a name,
+  a new property is created; the given \a flags then specify how this
+  property may be accessed by script code.
+
+  If \a value is invalid, the property is removed.
+
+  If the property is implemented using a setter function (i.e. has the
+  PropertySetter flag set), calling setProperty() has side-effects on
+  the script engine, since the setter function will be called with the
+  given \a value as argument (possibly resulting in an uncaught script
+  exception).
+
+  Note that you cannot specify custom getter or setter functions for
+  built-in properties, such as the \c{length} property of Array objects
+  or meta properties of QObject objects.
+
+  \sa property()
+*/
+void QScriptValue::setProperty(const QString& name, const QScriptValue& value, const PropertyFlags& flags)
+{
+    d_ptr->setProperty(name, QScriptValuePrivate::get(value), flags);
+}
+
+/*!
+  \overload
+
+  Sets the property at the given \a arrayIndex to the given \a value.
+
+  This function is provided for convenience and performance when
+  working with array objects.
+
+  If this QScriptValue is not an Array object, this function behaves
+  as if setProperty() was called with the string representation of \a
+  arrayIndex.
+*/
+void QScriptValue::setProperty(quint32 arrayIndex, const QScriptValue& value, const PropertyFlags& flags)
+{
+    d_ptr->setProperty(arrayIndex, QScriptValuePrivate::get(value), flags);
+}
+
+/*!
+  Sets the value of this QScriptValue's property with the given \a
+  name to the given \a value. The given \a flags specify how this
+  property may be accessed by script code.
+
+  This overload of setProperty() is useful when you need to set the
+  same property repeatedly, since the operation can be performed
+  faster when the name is represented as an interned string.
+
+  \sa QScriptEngine::toStringHandle()
+*/
+void QScriptValue::setProperty(const QScriptString& name, const QScriptValue& value, const PropertyFlags& flags)
+{
+    d_ptr->setProperty(QScriptStringPrivate::get(name).constData(), QScriptValuePrivate::get(value), flags);
+}