diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-29 11:59:54 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-31 21:49:21 +0100 |
commit | bbc36ebbc38de276b85947b65d89897bf430add5 (patch) | |
tree | 31c4a4754210fe3e97391c9dffdc31e105885390 /src/qml/qml/qqmlvme.cpp | |
parent | 7d850df7e68e0eab0f07d5f7a03050175080fb81 (diff) |
Speed up lookups of imported scripts
The QQmlContextData stores the JS objects of imported scripts in a
QList<PersistentValue>. Instead of indexing into that list, this patch changes
ctxt->importedScripts to be a JavaScript array, that in the IR we can index via
subscript.
Change-Id: Ie2c35fb5294a20a0b7084bb51d19671a27195fec
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
-rw-r--r-- | src/qml/qml/qqmlvme.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index c1c05fac11..b425b84a53 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -791,7 +791,13 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, QML_END_INSTR(StoreSignal) QML_BEGIN_INSTR(StoreImportedScript) - CTXT->importedScripts << SCRIPTS.at(instr.value)->scriptValueForContext(CTXT); + QV4::Scope scope(v4); + QV4::ScopedObject scripts(scope, CTXT->importedScripts.value()); + if (!scripts) { + scripts = v4->newArrayObject(); + CTXT->importedScripts = scripts; + } + scripts->putIndexed(instr.value, SCRIPTS.at(instr.value)->scriptValueForContext(CTXT)); QML_END_INSTR(StoreImportedScript) QML_BEGIN_INSTR(StoreScriptString) |