Changeset 63318 in webkit for trunk/JavaScriptCore/qt/tests

Timestamp:

Jul 14, 2010, 7:35:08 AM (15 years ago)

Author:

[email protected]

Message:

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

Reviewed by Kenneth Rohde Christiansen.

Introduce QScriptOriginalGlobalObject.

QtScript exposes more functionality than JSC C API. Sometimes it is
necessary to take a shortcut in implementation. Really often we have
to use a standard JS function. These function could be changed or
even deleted by a script, so a backup of a reference to an object is needed.

In them same time this is rather a workaround then real fix, so the code
should be separated and changed easily in future. It is why we need
the new internal class.

The patch fixes a few crashes.

[Qt] QScriptEngine should work correctly even after global object changes
​https://bugs.webkit.org/show_bug.cgi?id=41839

• api/QtScript.pro:
• api/qscriptengine_p.cpp: (QScriptEnginePrivate::QScriptEnginePrivate): (QScriptEnginePrivate::~QScriptEnginePrivate):
• api/qscriptengine_p.h: (QScriptEnginePrivate::isArray): (QScriptEnginePrivate::isError): (QScriptEnginePrivate::objectHasOwnProperty): (QScriptEnginePrivate::objectGetOwnPropertyNames):
• api/qscriptoriginalglobalobject_p.h: Added. (QScriptOriginalGlobalObject::QScriptOriginalGlobalObject): (QScriptOriginalGlobalObject::initializeMember): (QScriptOriginalGlobalObject::~QScriptOriginalGlobalObject): (QScriptOriginalGlobalObject::objectHasOwnProperty): (QScriptOriginalGlobalObject::objectGetOwnPropertyNames): (QScriptOriginalGlobalObject::isArray): (QScriptOriginalGlobalObject::isError): (QScriptOriginalGlobalObject::isType):
• api/qscriptvalue_p.h: (QScriptValuePrivate::isError): (QScriptValuePrivate::hasOwnProperty):
• api/qscriptvalueiterator_p.h: (QScriptValueIteratorPrivate::QScriptValueIteratorPrivate):
• tests/qscriptvalue/tst_qscriptvalue.cpp: (tst_QScriptValue::globalObjectChanges):
• tests/qscriptvalue/tst_qscriptvalue.h:

Location:

trunk/JavaScriptCore/qt/tests/qscriptvalue

Files:

• tst_qscriptvalue.cpp (modified) (1 diff)
• tst_qscriptvalue.h (modified) (1 diff)

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

@@ -1262 +1262 @@
 }
 
+void tst_QScriptValue::globalObjectChanges()
+{
+    // API functionality shouldn't depend on Global Object.
+    QScriptEngine engine;
+    QScriptValue array = engine.newArray();
+    QScriptValue error = engine.evaluate("new Error");
+    QScriptValue object = engine.newObject();
+
+    object.setProperty("foo", 512);
+
+    // Remove properties form global object.
+    engine.evaluate("delete Object; delete Error; delete Array;");
+
+    QVERIFY(array.isArray());
+    QVERIFY(error.isError());
+    QVERIFY(object.isObject());
+
+    QVERIFY(object.property("foo").isValid());
+    QVERIFY(object.property("foo", QScriptValue::ResolveLocal).isValid());
+    object.setProperty("foo", QScriptValue());
+    QVERIFY(!object.property("foo").isValid());
+    QVERIFY(!object.property("foo", QScriptValue::ResolveLocal).isValid());
+}
+
 QTEST_MAIN(tst_QScriptValue)

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

@@ -61 +61 @@
     void propertyFlag_data();
     void propertyFlag();
+    void globalObjectChanges();
 
     // Generated test functions.