Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-06 19:03:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed contexts for V8 callbacks

Browse source
This commit is contained in:
ksuprynowicz 2023-05-27 13:32:02 +02:00
parent ab21945a54
commit db15ed2f13
3 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/script-engine/src/v8/ScriptEngineV8.cpp
View file

@ -1164,6 +1164,7 @@ ScriptValue ScriptEngineV8::newFunction(ScriptEngine::FunctionSignature fun, int
(object->GetAlignedPointerFromInternalField(0));
ScriptEngineV8 *scriptEngine = reinterpret_cast<ScriptEngineV8*>
(object->GetAlignedPointerFromInternalField(1));
ContextScopeV8 contextScopeV8(scriptEngine);
ScriptContextV8Wrapper scriptContext(scriptEngine, &info, scriptEngine->getContext(), scriptEngine->currentContext()->parentContext());
ScriptContextGuard scriptContextGuard(&scriptContext);
ScriptValue result = function(&scriptContext, scriptEngine);
@ -1433,3 +1434,18 @@ void ScriptEngineV8::dumpHeapObjectStatistics() {
}
}
}
ContextScopeV8::ContextScopeV8(ScriptEngineV8 *engine) :
_engine(engine) {
Q_ASSERT(engine);
_isContextChangeNeeded = engine->getContext() != engine->getIsolate()->GetCurrentContext();
if (_isContextChangeNeeded) {
engine->pushContext(engine->getIsolate()->GetCurrentContext());
}
}
ContextScopeV8::~ContextScopeV8() {
if (_isContextChangeNeeded) {
_engine->popContext();
}
}

12
libraries/script-engine/src/v8/ScriptEngineV8.h
View file

@ -274,6 +274,18 @@ private:
#endif
};
// This class is used to automatically add context to script engine's context list that is used by C++ calls
// An instance of it needs to be created in every V8 callback
class ContextScopeV8 {
public:
ContextScopeV8(ScriptEngineV8 *engine);
~ContextScopeV8();
private:
bool _isContextChangeNeeded;
ScriptEngineV8* _engine;
};
#include "V8Types.h"
#endif // hifi_ScriptEngineV8_h

18
libraries/script-engine/src/v8/ScriptObjectV8Proxy.cpp
View file

@ -462,6 +462,8 @@ void ScriptObjectV8Proxy::v8Get(v8::Local<v8::Name> name, const v8::PropertyCall
}
v8::Local<v8::String> v8NameString;
ContextScopeV8 contextScopeV8(proxy->_engine);
if (name->IsString()) {
V8ScriptString nameString(proxy->_engine, v8::Local<v8::String>::Cast(name));
uint id;
@ -497,6 +499,8 @@ void ScriptObjectV8Proxy::v8Set(v8::Local<v8::Name> name, v8::Local<v8::Value> v
Q_ASSERT(false);
}
ContextScopeV8 contextScopeV8(proxy->_engine);
if (name->IsString()) {
V8ScriptString nameString(proxy->_engine, v8::Local<v8::String>::Cast(name));
uint id;
@ -800,6 +804,8 @@ void ScriptVariantV8Proxy::v8Get(v8::Local<v8::Name> name, const v8::PropertyCal
}
V8ScriptValue object(proxy->_engine, proxy->_v8Object.Get(info.GetIsolate()));
ContextScopeV8 contextScopeV8(proxy->_engine);
if (name->IsString()) {
V8ScriptString nameString(proxy->_engine, v8::Local<v8::String>::Cast(name));
uint id;
@ -831,6 +837,7 @@ void ScriptVariantV8Proxy::v8Set(v8::Local<v8::Name> name, v8::Local<v8::Value>
Q_ASSERT(false);
}
ContextScopeV8 contextScopeV8(proxy->_engine);
if (name->IsString()) {
V8ScriptString nameString(proxy->_engine, v8::Local<v8::String>::Cast(name));
uint id;
@ -940,16 +947,8 @@ void ScriptMethodV8Proxy::callback(const v8::FunctionCallbackInfo<v8::Value>& ar
}
ScriptMethodV8Proxy *proxy = reinterpret_cast<ScriptMethodV8Proxy*>(data->GetAlignedPointerFromInternalField(1));
// V8TODO: all other V8 callbacks need this too
bool isContextChangeNeeded = (proxy->_engine->getContext() != arguments.GetIsolate()->GetCurrentContext());
if (isContextChangeNeeded) {
qDebug() << "ScriptMethodV8Proxy::callback : changing context";
proxy->_engine->pushContext(arguments.GetIsolate()->GetCurrentContext());
}
ContextScopeV8 contextScopeV8(proxy->_engine);
proxy->call(arguments);
if (isContextChangeNeeded) {
proxy->_engine->popContext();
}
}
void ScriptMethodV8Proxy::call(const v8::FunctionCallbackInfo<v8::Value>& arguments) {
@ -958,6 +957,7 @@ void ScriptMethodV8Proxy::call(const v8::FunctionCallbackInfo<v8::Value>& argume
v8::Locker locker(isolate);
v8::Isolate::Scope isolateScope(isolate);
v8::HandleScope handleScope(isolate);
ContextScopeV8 contextScopeV8(_engine);
v8::Context::Scope contextScope(_engine->getContext());
QObject* qobject = _object;
if (!qobject) {