diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-07-04 22:04:49 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-07-05 09:06:46 +0000 |
commit | 493edae038338320fb29a3eb252f76c2ff24b74f (patch) | |
tree | ffefca70b2221aa7e8a145f8334fbaf1e5f8d268 /src/qml/jsruntime/qv4engine.cpp | |
parent | cfb17c44cf3ae1268d066ba414759068059a7bbd (diff) |
Get rid of the GlobalContext and WithContext classes
They are just ExecutionContext's.
Change-Id: Id543934740b0e54172e469935513847224b19e79
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index d17af43ca4..f2f032df51 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -516,9 +516,10 @@ void ExecutionEngine::setProfiler(Profiling::Profiler *profiler) void ExecutionEngine::initRootContext() { Scope scope(this); - Scoped<GlobalContext> r(scope, memoryManager->allocManaged<GlobalContext>( - sizeof(GlobalContext::Data) + sizeof(CallData))); - r->d_unchecked()->init(this); + Scoped<ExecutionContext> r(scope, memoryManager->allocManaged<ExecutionContext>( + sizeof(ExecutionContext::Data) + sizeof(CallData))); + r->d_unchecked()->init(Heap::ExecutionContext::Type_GlobalContext); + r->d()->activation.set(this, globalObject->d()); r->d()->callData = reinterpret_cast<CallData *>(r->d() + 1); r->d()->callData->tag = quint32(Value::ValueTypeInternal::Integer); r->d()->callData->argc = 0; |