V4 Debugger: Avoid looking up values in debugger thread

To avoid interaction with the engine from the debugger thread we
move the value lookup functionality into the data collector, and
drop the RefHolder. Also, we define some more debugger jobs to
move the work the request handlers do into the GUI thread.

Task-number: QTBUG-50481
Change-Id: Ia73ebd01e715f13110ef010a766e9b0a1e202df9
Reviewed-by: Nils Jeisecke <jeisecke@saltation.de>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 0 insertions, 10 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
index 273e5ffd62..658b1b3998 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
@@ -78,13 +78,6 @@ public:
     void signalEmitted(const QString &signal);
     void send(QJsonObject v8Payload);
 
-    QJsonObject buildScope(int frameNr, int scopeNr, QV4::Debugging::V4Debugger *debugger);
-    QJsonArray buildRefs();
-    QJsonValue lookup(QV4DataCollector::Ref refId);
-    QJsonValue toRef(QV4DataCollector::Ref ref);
-
-    QJsonObject buildFrame(const QV4::StackFrame &stackFrame, int frameNr,
-                           QV4::Debugging::V4Debugger *debugger);
     int selectedFrame() const;
     void selectFrame(int frameNr);
 
@@ -92,7 +85,6 @@ public:
 
     QV4DataCollector *collector() const;
     QV4DebuggerAgent debuggerAgent;
-    QV4DataCollector::Refs *refs();
 
 protected:
     void messageReceived(const QByteArray &);
@@ -106,14 +98,12 @@ private:
                                   const QByteArray &message = QByteArray());
     void processCommand(const QByteArray &command, const QByteArray &data);
     V8CommandHandler *v8CommandHandler(const QString &command) const;
-    int encodeScopeType(QV4::Heap::ExecutionContext::ContextType scopeType);
 
     QStringList breakOnSignals;
     QMap<int, QV4::Debugging::V4Debugger *> debuggerMap;
     static int debuggerIndex;
     static int sequence;
     const int version;
-    QV4DataCollector::Refs collectedRefs;
 
     QScopedPointer<QV4DataCollector> theCollector;
     int theSelectedFrame;