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/qqmlobjectcreator.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/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index 56776dcb82..8cce2db340 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -525,8 +525,14 @@ QObject *QmlObjectCreator::create(int subComponentIndex, QObject *parent) context->setIdPropertyData(mapping); if (subComponentIndex == -1) { - foreach (QQmlScriptData *script, compiledData->scripts) - context->importedScripts << script->scriptValueForContext(context); + QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine); + QV4::Scope scope(v4); + QV4::ScopedObject scripts(scope, v4->newArrayObject(compiledData->scripts.count())); + for (int i = 0; i < compiledData->scripts.count(); ++i) { + QQmlScriptData *s = compiledData->scripts.at(i); + scripts->putIndexed(i, s->scriptValueForContext(context)); + } + context->importedScripts = scripts; } else if (parentContext) { context->importedScripts = parentContext->importedScripts; } |