diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-11-12 13:32:41 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-15 13:16:08 +0100 |
commit | 42674114127436564cf4598d54f671d46c1427b5 (patch) | |
tree | 58db5d1efa04cf6e87e83666684a7fa177c9d0f7 /src/qml/jsruntime/qv4argumentsobject.cpp | |
parent | 7cc5fb2b53616ed2ca2b525262457fb44e2b5355 (diff) |
Change signature of defineOwnProperty to take an engine instead of a context
Change-Id: Ib0d558d17162a205974c6f2f0daf8af5b0b9547b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4argumentsobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4argumentsobject.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4argumentsobject.cpp b/src/qml/jsruntime/qv4argumentsobject.cpp index 0a4abd4942..14f9b0e68a 100644 --- a/src/qml/jsruntime/qv4argumentsobject.cpp +++ b/src/qml/jsruntime/qv4argumentsobject.cpp @@ -96,11 +96,11 @@ void ArgumentsObject::fullyCreate() d()->fullyCreated = true; } -bool ArgumentsObject::defineOwnProperty(ExecutionContext *ctx, uint index, const Property &desc, PropertyAttributes attrs) +bool ArgumentsObject::defineOwnProperty(ExecutionEngine *engine, uint index, const Property &desc, PropertyAttributes attrs) { fullyCreate(); - Scope scope(ctx); + Scope scope(engine); Property *pd = arrayData() ? arrayData()->getProperty(index) : 0; Property map; PropertyAttributes mapAttrs; @@ -118,10 +118,10 @@ bool ArgumentsObject::defineOwnProperty(ExecutionContext *ctx, uint index, const pd->value = mappedArguments()->data[index]; } - bool strict = ctx->d()->strictMode; - ctx->d()->strictMode = false; - bool result = Object::defineOwnProperty2(ctx, index, desc, attrs); - ctx->d()->strictMode = strict; + bool strict = engine->currentContext()->d()->strictMode; + engine->currentContext()->d()->strictMode = false; + bool result = Object::defineOwnProperty2(scope.engine, index, desc, attrs); + engine->currentContext()->d()->strictMode = strict; if (isMapped && attrs.isData()) { Q_ASSERT(arrayData()); @@ -137,8 +137,8 @@ bool ArgumentsObject::defineOwnProperty(ExecutionContext *ctx, uint index, const } } - if (ctx->d()->strictMode && !result) - return ctx->engine()->throwTypeError(); + if (engine->currentContext()->d()->strictMode && !result) + return engine->throwTypeError(); return result; } |