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

Further work on V8

Browse source
This commit is contained in:
ksuprynowicz 2023-01-30 21:16:37 +01:00
parent d60c3abffa
commit abe409dbd8
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/script-engine/src/v8/ScriptEngineV8_cast.cpp
View file

@ -344,6 +344,8 @@ bool ScriptEngineV8::castValueToVariant(const V8ScriptValue& v8Val, QVariant& de
if (demarshalFunc) { if (demarshalFunc) {
dest = QVariant(destTypeId, static_cast<void*>(NULL)); dest = QVariant(destTypeId, static_cast<void*>(NULL));
ScriptValue wrappedVal(new ScriptValueV8Wrapper(this, v8Val)); ScriptValue wrappedVal(new ScriptValueV8Wrapper(this, v8Val));
Q_ASSERT(dest.constData() != nullptr);
//V8TODO: Data should never be written to dest.constData() according to Qt documentation.
bool success = demarshalFunc(wrappedVal, const_cast<void*>(dest.constData())); bool success = demarshalFunc(wrappedVal, const_cast<void*>(dest.constData()));
if(!success) dest = QVariant(); if(!success) dest = QVariant();
return success; return success;
@ -689,6 +691,7 @@ V8ScriptValue ScriptEngineV8::castVariantToValue(const QVariant& val) {
_customTypeProtect.unlock(); _customTypeProtect.unlock();
} }
if (marshalFunc) { if (marshalFunc) {
Q_ASSERT(val.constData() != nullptr);
ScriptValue wrappedVal = marshalFunc(this, val.constData()); ScriptValue wrappedVal = marshalFunc(this, val.constData());
return ScriptValueV8Wrapper::fullUnwrap(this, wrappedVal); return ScriptValueV8Wrapper::fullUnwrap(this, wrappedVal);
} }

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

@ -1087,6 +1087,8 @@ int ScriptSignalV8Proxy::qt_metacall(QMetaObject::Call call, int id, void** argu
connections = _connections; connections = _connections;
});*/ });*/
// V8TODO: this may cause deadlocks on connect/disconnect, so the connect/disconnect procedure needs to be reworked.
// It should probably add events to a separate list that would be processed before and after all the events for the signal.
withReadLock([&]{ withReadLock([&]{
//for (ConnectionList::iterator iter = connections.begin(); iter != connections.end(); ++iter) { //for (ConnectionList::iterator iter = connections.begin(); iter != connections.end(); ++iter) {
for (ConnectionList::iterator iter = _connections.begin(); iter != _connections.end(); ++iter) { for (ConnectionList::iterator iter = _connections.begin(); iter != _connections.end(); ++iter) {
@ -1099,7 +1101,11 @@ int ScriptSignalV8Proxy::qt_metacall(QMetaObject::Call call, int id, void** argu
Q_ASSERT(!conn.callback.get().IsEmpty()); Q_ASSERT(!conn.callback.get().IsEmpty());
Q_ASSERT(!conn.callback.get()->IsUndefined()); Q_ASSERT(!conn.callback.get()->IsUndefined());
Q_ASSERT(!conn.callback.get()->IsNull()); if(conn.callback.get()->IsNull()) {
qDebug() << "ScriptSignalV8Proxy::qt_metacall: Connection callback is Null";
_engine->popContext();
continue;
}
if (!conn.callback.get()->IsFunction()) { if (!conn.callback.get()->IsFunction()) {
auto stringV8 = conn.callback.get()->ToDetailString(functionContext).ToLocalChecked(); auto stringV8 = conn.callback.get()->ToDetailString(functionContext).ToLocalChecked();
QString error = *v8::String::Utf8Value(_engine->getIsolate(), stringV8); QString error = *v8::String::Utf8Value(_engine->getIsolate(), stringV8);