diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-21 14:55:53 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-09-15 07:37:08 +0000 |
| commit | 7dab89a65ef859ef1982d5b882cb74a0a34e53a9 (patch) | |
| tree | 496f65fb6c0c6d158facca02bf83944269874a77 /src/qml/jsruntime/qv4scopedvalue_p.h | |
| parent | b5902bd43a3b45a25e3b960b20c3c1ecb41073fe (diff) | |
Cleanup the ExecutionContextSaver
Always operate on the current context (as that's what we do
in practice anyway).
Change-Id: I4171207a7a86e69aa685754956c0764ac6e152a7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime/qv4scopedvalue_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4scopedvalue_p.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h index e19aeaf882..563b8b0e93 100644 --- a/src/qml/jsruntime/qv4scopedvalue_p.h +++ b/src/qml/jsruntime/qv4scopedvalue_p.h @@ -416,20 +416,11 @@ struct ExecutionContextSaver ExecutionEngine *engine; Value *savedContext; - ExecutionContextSaver(Scope &scope, ExecutionContext *context) - : engine(context->d()->engine) + ExecutionContextSaver(Scope &scope) + : engine(scope.engine) , savedContext(scope.alloc(1)) { - savedContext->setM(context->d()); -#if QT_POINTER_SIZE == 4 - savedContext->setTag(QV4::Value::Managed_Type); -#endif - } - ExecutionContextSaver(Scope &scope, Heap::ExecutionContext *context) - : engine(context->engine) - , savedContext(scope.alloc(1)) - { - savedContext->setM(context); + savedContext->setM(scope.engine->currentContext()); #if QT_POINTER_SIZE == 4 savedContext->setTag(QV4::Value::Managed_Type); #endif |