Showing the changes to libraries/script-engine/src/ScriptCache.cpp (1 of 5 files). Show all
Unified · Split
| @@ -28,10 +28,9 @@ ScriptCache::ScriptCache(QObject* parent) { · 27 unmodified lines | |||
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | void ScriptCache::clearCache() { | 30 | void ScriptCache::clearCache() { |
| 31 | _scriptCache.clear(); | 31 | _scriptCache.clear(); |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | |||
| 35 | QString ScriptCache::getScript(const QUrl& unnormalizedURL, ScriptUser* scriptUser, bool& isPending, bool reload) { | 34 | QString ScriptCache::getScript(const QUrl& unnormalizedURL, ScriptUser* scriptUser, bool& isPending, bool reload) { |
| 36 | QUrl url = ResourceManager::normalizeURL(unnormalizedURL); | 35 | QUrl url = ResourceManager::normalizeURL(unnormalizedURL); |
| 37 | QString scriptContents; | 36 | QString scriptContents; |
| @@ -100,8 +99,6 @@ void ScriptCache::getScriptContents(const QString& scriptOrURL, contentAvailable · 62 unmodified lines | |||
| 100 | return; | 99 | return; |
| 101 | } | 100 | } |
| 102 | 101 | ||
| 103 | qCDebug(scriptengine) << "ScriptCache::getScriptContents() scriptOrURL:" << scriptOrURL << " forceDownload:" << forceDownload << " on thread[" << QThread::currentThread() << "] expected thread[" << thread() << "]"; | ||
| 104 | |||
| 105 | if (_scriptCache.contains(url) && !forceDownload) { | 102 | if (_scriptCache.contains(url) && !forceDownload) { |
| 106 | qCDebug(scriptengine) << "Found script in cache:" << url.toString(); | 103 | qCDebug(scriptengine) << "Found script in cache:" << url.toString(); |
| 107 | #if 1 // def THREAD_DEBUGGING | 104 | #if 1 // def THREAD_DEBUGGING |