Add support for conditional breakpoints and evaluate.

Also centralized the context state saver and added line number saving, so that the
JS jobs for evaluation of breakpoint conditions don't change the state of the current
engine context.

Task-number: QTBUG-37119
Task-number: QTCREATORBUG-11516
Change-Id: Ia21b3d64e239e5b67f3c07e1c006d8e6748f29b6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 24 insertions, 0 deletions

diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index 6a749d1438..6f947cd430 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -55,6 +55,30 @@ namespace QV4 {
 
 struct ExecutionContext;
 
+struct ContextStateSaver {
+    ExecutionContext *savedContext;
+    bool strictMode;
+    Lookup *lookups;
+    CompiledData::CompilationUnit *compilationUnit;
+    int lineNumber;
+
+    ContextStateSaver(ExecutionContext *context)
+        : savedContext(context)
+        , strictMode(context->d()->strictMode)
+        , lookups(context->d()->lookups)
+        , compilationUnit(context->d()->compilationUnit)
+        , lineNumber(context->d()->lineNumber)
+    {}
+
+    ~ContextStateSaver()
+    {
+        savedContext->d()->strictMode = strictMode;
+        savedContext->d()->lookups = lookups;
+        savedContext->d()->compilationUnit = compilationUnit;
+        savedContext->d()->lineNumber = lineNumber;
+    }
+};
+
 struct Q_QML_EXPORT QmlBindingWrapper : FunctionObject {
     struct Data : FunctionObject::Data {
         Data(ExecutionContext *scope, Function *f, Object *qml);