diff options
| author | Kai Dohmen <psykai1993@googlemail.com> | 2016-04-28 22:08:55 +0200 |
|---|---|---|
| committer | Milian Wolff <milian.wolff@kdab.com> | 2016-07-21 09:04:31 +0000 |
| commit | 43ff11f564d90f7818d741ae4304462938c38438 (patch) | |
| tree | 2f495575f7b52c27dc3325fea9c60215f3582f82 /src/webchannel/qmetaobjectpublisher_p.h | |
| parent | e35346cf70598c47a456946327927643910aa277 (diff) | |
| download | qtwebchannel-43ff11f564d90f7818d741ae4304462938c38438.tar.gz | |
Remove deleted transport objects
Added a QMultiHash which maps transport objects to wrapped object ids.
transportRemoved iterates over all matching wrapped objects and removes
the passed transport object from their transports-vector. If the
transports-vector is empty after removing the passed transport object
the objectDestroyed will be called on the wrapped object.
transportRemoved will be called either on the transports destoryed
signal or on disconnecting the webchannel from it.
Without this changes the QMetaObjectPublisher::wrappedObjects and
::registeredObjectIds would only be cleaned up if the website calls
deleteLater on QObjects but not on website reloads.
Task-number: QTBUG-50074
Change-Id: If294564fee2406edd7fb578852aeb269cac23a92
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
(cherry picked from commit fa2374d7c4dedea907e2df26fdad28bdee73b122)
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/webchannel/qmetaobjectpublisher_p.h')
| -rw-r--r-- | src/webchannel/qmetaobjectpublisher_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h index 048a33c..95e5077 100644 --- a/src/webchannel/qmetaobjectpublisher_p.h +++ b/src/webchannel/qmetaobjectpublisher_p.h @@ -171,6 +171,11 @@ public: QVariant toVariant(const QJsonValue &value, int targetType) const; /** + * Remove wrapped objects which last transport relation is with the passed transport object. + */ + void transportRemoved(QWebChannelAbstractTransport *transport); + + /** * Given a QVariant containing a QObject*, wrap the object and register for property updates * return the objects class information. * @@ -251,6 +256,8 @@ private: // Map of objects wrapped from invocation returns QHash<QString, ObjectInfo> wrappedObjects; + // Map of transports to wrapped object ids + QMultiHash<QWebChannelAbstractTransport*, QString> transportedWrappedObjects; // Map of objects to maps of signal indices to a set of all their property indices. // The last value is a set as a signal can be the notify signal of multiple properties. |