implement QObject wrapper caching (PreferExistingWrapperObject)

1 files changed, 29 insertions, 0 deletions

diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index 0f54ec9..e668df3 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -1926,6 +1926,17 @@ void QObjectData::mark()
 {
     if (connectionManager)
         connectionManager->mark();
+    {
+        QList<QScript::QObjectWrapperInfo>::iterator it;
+        for (it = wrappers.begin(); it != wrappers.end(); ) {
+            const QScript::QObjectWrapperInfo &info = *it;
+            if (info.object->marked()) {
+                ++it;
+            } else {
+                it = wrappers.erase(it);
+            }
+        }
+    }
 }
 
 bool QObjectData::addSignalHandler(QObject *sender,
@@ -1951,6 +1962,24 @@ bool QObjectData::removeSignalHandler(QObject *sender,
         sender, signalIndex, receiver, slot);
 }
 
+QScriptObject *QObjectData::findWrapper(QScriptEngine::ValueOwnership ownership,
+                                        const QScriptEngine::QObjectWrapOptions &options) const
+{
+    for (int i = 0; i < wrappers.size(); ++i) {
+        const QObjectWrapperInfo &info = wrappers.at(i);
+        if ((info.ownership == ownership) && (info.options == options))
+            return info.object;
+    }
+    return 0;
+}
+
+void QObjectData::registerWrapper(QScriptObject *wrapper,
+                                  QScriptEngine::ValueOwnership ownership,
+                                  const QScriptEngine::QObjectWrapOptions &options)
+{
+    wrappers.append(QObjectWrapperInfo(wrapper, ownership, options));
+}
+
 } // namespace QScript
 
 namespace JSC