diff options
| -rw-r--r-- | src/declarative/qml/v8/qjsengine.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/v8/qv8engine_p.h | 19 | ||||
| -rw-r--r-- | tests/auto/declarative/qjsengine/tst_qjsengine.cpp | 40 |
3 files changed, 38 insertions, 23 deletions
diff --git a/src/declarative/qml/v8/qjsengine.cpp b/src/declarative/qml/v8/qjsengine.cpp index 3db7fc40e0..e466afc30c 100644 --- a/src/declarative/qml/v8/qjsengine.cpp +++ b/src/declarative/qml/v8/qjsengine.cpp @@ -378,7 +378,7 @@ QJSValue QJSEngine::newQObject(QObject *object) Q_D(QJSEngine); QScriptIsolate api(d, QScriptIsolate::NotNullEngine); v8::HandleScope handleScope; - return d->scriptValueFromInternal(d->newQObject(object)); + return d->scriptValueFromInternal(d->newQObject(object, QV8Engine::JavaScriptOwnership)); } /*! diff --git a/src/declarative/qml/v8/qv8engine_p.h b/src/declarative/qml/v8/qv8engine_p.h index 185eb545ef..e8163fbb80 100644 --- a/src/declarative/qml/v8/qv8engine_p.h +++ b/src/declarative/qml/v8/qv8engine_p.h @@ -228,6 +228,10 @@ public: QV8Engine(QJSEngine* qq,QJSEngine::ContextOwnership ownership = QJSEngine::CreateNewContext); ~QV8Engine(); + // ### TODO get rid of it, do we really need CppOwnership? + // This enum should be in sync with QDeclarativeEngine::ObjectOwnership + enum ObjectOwnership { CppOwnership, JavaScriptOwnership }; + struct Deletable { virtual ~Deletable() {} }; @@ -311,6 +315,7 @@ public: // Return a JS wrapper for the given QObject \a object inline v8::Handle<v8::Value> newQObject(QObject *object); + inline v8::Handle<v8::Value> newQObject(QObject *object, const ObjectOwnership ownership); inline bool isQObject(v8::Handle<v8::Value>); inline QObject *toQObject(v8::Handle<v8::Value>); @@ -511,6 +516,20 @@ v8::Handle<v8::Value> QV8Engine::newQObject(QObject *object) return m_qobjectWrapper.newQObject(object); } +v8::Handle<v8::Value> QV8Engine::newQObject(QObject *object, const ObjectOwnership ownership) +{ + if (!object) + return v8::Null(); + + v8::Handle<v8::Value> result = newQObject(object); + QDeclarativeData *ddata = QDeclarativeData::get(object, true); + if (ownership == JavaScriptOwnership && ddata) { + ddata->indestructible = false; + ddata->explicitIndestructibleSet = true; + } + return result; +} + v8::Local<v8::String> QV8Engine::toString(const QString &string) { return m_stringWrapper.toString(string); diff --git a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp index 6907fb01c7..6b18bacb96 100644 --- a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp @@ -182,9 +182,7 @@ private slots: void castWithPrototypeChain(); #endif void castWithMultipleInheritance(); -#if 0 // ###FIXME: ScriptOwnership void collectGarbage(); -#endif #if 0 // ###FIXME: no reportAdditionalMemoryCost API void reportAdditionalMemoryCost(); #endif @@ -965,34 +963,33 @@ void tst_QJSEngine::newQObject() void tst_QJSEngine::newQObject_ownership() { -#if 0 // FIXME: ownership tests need to be revivewed - QScriptEngine eng; + QJSEngine eng; { QPointer<QObject> ptr = new QObject(); QVERIFY(ptr != 0); { - QScriptValue v = eng.newQObject(ptr, QScriptEngine::ScriptOwnership); + QJSValue v = eng.newQObject(ptr); } - eng.evaluate("gc()"); + collectGarbage_helper(eng); if (ptr) - QEXPECT_FAIL("", "In the JSC-based back-end, script-owned QObjects are not always deleted immediately during GC", Continue); + QApplication::sendPostedEvents(ptr, QEvent::DeferredDelete); QVERIFY(ptr == 0); } { - QPointer<QObject> ptr = new QObject(); + QPointer<QObject> ptr = new QObject(this); QVERIFY(ptr != 0); { - QScriptValue v = eng.newQObject(ptr, QScriptEngine::QtOwnership); + QJSValue v = eng.newQObject(ptr); } QObject *before = ptr; - eng.evaluate("gc()"); + collectGarbage_helper(eng); QVERIFY(ptr == before); delete ptr; } { QObject *parent = new QObject(); QObject *child = new QObject(parent); - QScriptValue v = eng.newQObject(child, QScriptEngine::QtOwnership); + QJSValue v = eng.newQObject(child); QCOMPARE(v.toQObject(), child); delete parent; QCOMPARE(v.toQObject(), (QObject *)0); @@ -1001,12 +998,12 @@ void tst_QJSEngine::newQObject_ownership() QPointer<QObject> ptr = new QObject(); QVERIFY(ptr != 0); { - QScriptValue v = eng.newQObject(ptr, QScriptEngine::AutoOwnership); + QJSValue v = eng.newQObject(ptr); } - eng.evaluate("gc()"); + collectGarbage_helper(eng); // no parent, so it should be like ScriptOwnership if (ptr) - QEXPECT_FAIL("", "In the JSC-based back-end, script-owned QObjects are not always deleted immediately during GC", Continue); + QApplication::sendPostedEvents(ptr, QEvent::DeferredDelete); QVERIFY(ptr == 0); } { @@ -1014,14 +1011,13 @@ void tst_QJSEngine::newQObject_ownership() QPointer<QObject> child = new QObject(parent); QVERIFY(child != 0); { - QScriptValue v = eng.newQObject(child, QScriptEngine::AutoOwnership); + QJSValue v = eng.newQObject(child); } - eng.evaluate("gc()"); + collectGarbage_helper(eng); // has parent, so it should be like QtOwnership QVERIFY(child != 0); delete parent; } -#endif } void tst_QJSEngine::newQObject_promoteObject() @@ -3097,21 +3093,21 @@ void tst_QJSEngine::castWithMultipleInheritance() QCOMPARE(qjsvalue_cast<QGraphicsItem*>(v), (QGraphicsItem *)&klz); } -#if 0 // ###FIXME: ScriptOwnership void tst_QJSEngine::collectGarbage() { - QScriptEngine eng; + QJSEngine eng; eng.evaluate("a = new Object(); a = new Object(); a = new Object()"); - QScriptValue a = eng.newObject(); + QJSValue a = eng.newObject(); a = eng.newObject(); a = eng.newObject(); QPointer<QObject> ptr = new QObject(); QVERIFY(ptr != 0); - (void)eng.newQObject(ptr, QScriptEngine::ScriptOwnership); + (void)eng.newQObject(ptr); collectGarbage_helper(eng); + if (ptr) + QApplication::sendPostedEvents(ptr, QEvent::DeferredDelete); QVERIFY(ptr == 0); } -#endif #if 0 // ###FIXME: no reportAdditionalMemoryCost API void tst_QJSEngine::reportAdditionalMemoryCost() |