working to clean up the QtScript implementation and move towards completion of the proxy interface

Heather Anderson committed 5 years ago

Commit 2dd9d781 parent 1e018db38 files · +2240 −923Browse files

Showing the changes to libraries/script-engine/src/ScriptManager.cpp (1 of 38 files). Show all

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+31−33

 #include <controllers/ScriptingInterface.h>
 #include <AnimationObject.h>
-#include "ArrayBufferViewClass.h"
 #include "AudioScriptingInterface.h"
 #include "AssetScriptingInterface.h"
 #include "BatchLoader.h"
-#include "DataViewClass.h"
 #include "EventTypes.h"
 #include "FileScriptingInterface.h" // unzip project
 #include "MenuItemProperties.h"
 #include "ScriptContext.h"
 #include "ScriptEngineCast.h"
 #include "ScriptEngineLogging.h"
-#include "TypedArrays.h"
 #include "XMLHttpRequestClass.h"
 #include "WebSocketClass.h"
 #include "RecordingScriptingInterface.h"
     AbstractLoggerInterface* loggerInterface = AbstractLoggerInterface::get();
     if (loggerInterface && loggerInterface->showSourceDebugging()) {
         ScriptContext* userContext = context;
+        ScriptContextPointer parentContext; // using this variable to maintain parent variable lifespan
         while (userContext && userContext->functionContext()->functionType() == ScriptFunctionContext::NativeFunction) {
-            userContext = userContext->parentContext();
+            parentContext = userContext->parentContext();
+            userContext = parentContext.data();
         }
         QString location;
         if (userContext) {
     // in that case it would be too difficult to tell which one should track the memory, and
     // this serves the common case (use in a single script).
     auto data = resource->getResource();
-    if (data && !resource->isInScript()) {
+    auto manager = engine->manager();
+    if (data && manager && !resource->isInScript()) {
         resource->setInScript(true);
-        QObject::connect(data.data(), SIGNAL(updateSize(qint64)), engine, SLOT(updateMemoryCost(qint64)));
+        QObject::connect(data.data(), SIGNAL(updateSize(qint64)), manager, SLOT(updateMemoryCost(qint64)));
     }
     auto object = engine->newQObject(
     handlersForEvent << handlerData; // Note that the same handler can be added many times. See removeEntityEventHandler().
 }
+bool ScriptManager::isStopped() const {
+    QSharedPointer<ScriptEngines> scriptEngines(_scriptEngines);
+    return !scriptEngines || scriptEngines->isStopped();
+}
 void ScriptManager::run() {
     if (QThread::currentThread() != qApp->thread() && _context == Context::CLIENT_SCRIPT) {
         // Flag that we're allowed to access local HTML files on UI created from C++ calls on this thread
     auto name = filenameParts.size() > 0 ? filenameParts[filenameParts.size() - 1] : "unknown";
     PROFILE_SET_THREAD_NAME("Script: " + name);
-    QSharedPointer<ScriptEngines> scriptEngines(_scriptEngines);
+    if (isStopped()) {
-    if (!scriptEngines || scriptEngines->isStopped()) {
         return; // bail early - avoid setting state in init(), as evaluate() will bail too
     }
 }
 void ScriptManager::updateMemoryCost(const qint64& deltaSize) {
-    if (deltaSize > 0) {
+    _engine->updateMemoryCost(deltaSize);
-        // We've patched qt to fix https://highfidelity.atlassian.net/browse/BUGZ-46 on mac and windows only.
-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
-        reportAdditionalMemoryCost(deltaSize);
-#endif
-    }
 }
 void ScriptManager::timerFired() {
-    {
+    if (isStopped()) {
-        QSharedPointer<ScriptEngines> scriptEngines(_scriptEngines);
+        scriptWarningMessage("Script.timerFired() while shutting down is ignored... parent script:" + getFilename());
-        if (!scriptEngines || scriptEngines->isStopped()) {
+        return; // bail early
-            scriptWarningMessage("Script.timerFired() while shutting down is ignored... parent script:" + getFilename());
-            return; // bail early
-        }
     }
     QTimer* callingTimer = reinterpret_cast<QTimer*>(sender());
 }
 QObject* ScriptManager::setInterval(const ScriptValuePointer& function, int intervalMS) {
-    QSharedPointer<ScriptEngines> scriptEngines(_scriptEngines);
+    if (isStopped()) {
-    if (!scriptEngines || scriptEngines->isStopped()) {
         scriptWarningMessage("Script.setInterval() while shutting down is ignored... parent script:" + getFilename());
         return NULL; // bail early
     }
 }
 QObject* ScriptManager::setTimeout(const ScriptValuePointer& function, int timeoutMS) {
-    QSharedPointer<ScriptEngines> scriptEngines(_scriptEngines);
+    if (isStopped()) {
-    if (!scriptEngines || scriptEngines->isStopped()) {
         scriptWarningMessage("Script.setTimeout() while shutting down is ignored... parent script:" + getFilename());
         return NULL; // bail early
     }
     // to the first absolute URL in the JS scope chain
     QUrl parentURL;
     auto context = _engine->currentContext();
+    ScriptContextPointer parentContext;  // using this variable to maintain parent variable lifespan
     do {
         auto contextInfo = context->functionContext();
         parentURL = QUrl(contextInfo->fileName());
-        context = context->parentContext();
+        parentContext = context->parentContext();
+        context = parentContext.data();
     } while (parentURL.isRelative() && context);
     if (parentURL.isRelative()) {
     auto jsRequire = _engine->globalObject()->property("Script")->property("require");
     auto cache = jsRequire->property("cache");
     auto candidate = ScriptValuePointer();
-    for (auto c = _engine->currentContext(); c && !candidate->isObject(); c = c->parentContext()) {
+    ScriptContextPointer parentContext;  // using this variable to maintain parent variable lifespan
-        auto contextInfo = c->functionContext();
+    for (auto context = _engine->currentContext(); context && !candidate->isObject(); parentContext = context->parentContext(), context = parentContext.data()) {
+        auto contextInfo = context->functionContext();
         candidate = cache->property(contextInfo->fileName());
     }
     if (!candidate->isObject()) {
     if (!_engine->IS_THREADSAFE_INVOCATION(__FUNCTION__)) {
         return;
     }
-    QSharedPointer<ScriptEngines> scriptEngines(_scriptEngines);
+    if (isStopped()) {
-    if (!scriptEngines || scriptEngines->isStopped()) {
         scriptWarningMessage("Script.include() while shutting down is ignored... includeFiles:"
                 + includeFiles.join(",") + "parent script:" + getFilename());
         return; // bail early
 }
 void ScriptManager::include(const QString& includeFile, ScriptValuePointer callback) {
-    QSharedPointer<ScriptEngines> scriptEngines(_scriptEngines);
+    if (isStopped()) {
-    if (!scriptEngines || scriptEngines->isStopped()) {
         scriptWarningMessage("Script.include() while shutting down is ignored...  includeFile:"
                     + includeFile + "parent script:" + getFilename());
         return; // bail early
     if (!_engine->IS_THREADSAFE_INVOCATION(__FUNCTION__)) {
         return;
     }
-    QSharedPointer<ScriptEngines> scriptEngines(_scriptEngines);
+    if (isStopped()) {
-    if (!scriptEngines || scriptEngines->isStopped()) {
         scriptWarningMessage("Script.load() while shutting down is ignored... loadFile:"
                 + loadFile + "parent script:" + getFilename());
         return; // bail early
     }
     return result;
 }
+ScriptValuePointer ScriptManager::evaluate(const QString& program, const QString& fileName) {
+    return _engine->evaluate(program, fileName);
+}