From bf51873870f94f56e8dccf25fea67b120f2db98f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 3 May 2013 14:08:55 +0200 Subject: Cleanup v8 Context handling We don't need or use v8 Context objects, so it's sufficient to have one global context for now. Remove all code related to entering or leaving Context's. Change-Id: I4f7ddaa4907e59de5713368fa13bbc40e5830542 Reviewed-by: Simon Hausmann --- src/particles/qquickcustomaffector.cpp | 1 - src/particles/qquickparticleemitter.cpp | 1 - src/particles/qquicktrailemitter.cpp | 1 - src/particles/qquickv8particledata.cpp | 2 -- 4 files changed, 5 deletions(-) (limited to 'src/particles') diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp index c7fc7a7830..23a1f6db50 100644 --- a/src/particles/qquickcustomaffector.cpp +++ b/src/particles/qquickcustomaffector.cpp @@ -144,7 +144,6 @@ void QQuickCustomAffector::affectSystem(qreal dt) dt = 1.0; v8::HandleScope handle_scope; - v8::Context::Scope scope(QQmlEnginePrivate::getV8Engine(qmlEngine(this))->context()); v8::Handle array = v8::Array::New(toAffect.size()); for (int i=0; iSet(i, toAffect[i]->v8Value().toV8Handle()); diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index 4177f873e2..e9e748d4d8 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -480,7 +480,6 @@ void QQuickParticleEmitter::emitWindow(int timeStamp) //Done after emitParticle so that the Painter::load is done first, this allows you to customize its static variables //We then don't need to request another reload, because the first reload isn't scheduled until we get back to the render thread v8::HandleScope handle_scope; - v8::Context::Scope scope(QQmlEnginePrivate::getV8Engine(qmlEngine(this))->context()); v8::Handle array = v8::Array::New(toEmit.size()); for (int i=0; iSet(i, toEmit[i]->v8Value().toV8Handle()); diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp index 244e35bb00..aca11f114e 100644 --- a/src/particles/qquicktrailemitter.cpp +++ b/src/particles/qquicktrailemitter.cpp @@ -270,7 +270,6 @@ void QQuickTrailEmitter::emitWindow(int timeStamp) if (isEmitConnected() || isEmitFollowConnected()) { v8::HandleScope handle_scope; - v8::Context::Scope scope(QQmlEnginePrivate::getV8Engine(qmlEngine(this))->context()); v8::Handle array = v8::Array::New(toEmit.size()); for (int i=0; iSet(i, toEmit[i]->v8Value().toV8Handle()); diff --git a/src/particles/qquickv8particledata.cpp b/src/particles/qquickv8particledata.cpp index 68f701fa88..4ca01e0a08 100644 --- a/src/particles/qquickv8particledata.cpp +++ b/src/particles/qquickv8particledata.cpp @@ -427,7 +427,6 @@ FAKE_FLOAT_GETTER_AND_SETTER(curAY, curAY, setInstantaneousAY) QV8ParticleDataDeletable::QV8ParticleDataDeletable(QV8Engine *engine) { v8::HandleScope handle_scope; - v8::Context::Scope scope(engine->context()); v8::Local ft = v8::FunctionTemplate::New(); ft->InstanceTemplate()->SetHasExternalResource(true); @@ -485,7 +484,6 @@ QQuickV8ParticleData::QQuickV8ParticleData(QV8Engine* engine, QQuickParticleData if (!engine || !datum) return; v8::HandleScope handle_scope; - v8::Context::Scope scope(engine->context()); QV8ParticleDataDeletable *d = particleV8Data(engine); m_v8Value = qPersistentNew(d->constructor->NewInstance()); -- cgit v1.2.3