Showing the changes to libraries/script-engine/src/v8/ScriptObjectV8Proxy.cpp (1 of 18 files). Show all
Unified · Split
| @@ -168,8 +168,7 @@ V8ScriptValue ScriptObjectV8Proxy::newQObject(ScriptEngineV8* engine, QObject* o · 167 unmodified lines | ||
| 168 | 168 | |
| 169 | 169 | ScriptObjectV8Proxy* ScriptObjectV8Proxy::unwrapProxy(const V8ScriptValue& val) { |
| 170 | 170 | auto isolate = val.getEngine()->getIsolate(); |
| 171 | − v8::Locker locker(isolate); | |
| 172 | − v8::Isolate::Scope isolateScope(isolate); | |
| 171 | + Q_ASSERT(isolate->IsCurrent()); | |
| 173 | 172 | v8::HandleScope handleScope(isolate); |
| 174 | 173 | v8::Local<v8::Context> context = val.constGetContext(); |
| 175 | 174 | v8::Context::Scope contextScope(context); |
| @@ -194,8 +193,7 @@ ScriptObjectV8Proxy* ScriptObjectV8Proxy::unwrapProxy(const V8ScriptValue& val) · 18 unmodified lines | ||
| 194 | 193 | } |
| 195 | 194 | |
| 196 | 195 | ScriptObjectV8Proxy* ScriptObjectV8Proxy::unwrapProxy(v8::Isolate* isolate, v8::Local<v8::Value> &value) { |
| 197 | − v8::Locker locker(isolate); | |
| 198 | − v8::Isolate::Scope isolateScope(isolate); | |
| 196 | + Q_ASSERT(isolate->IsCurrent()); | |
| 199 | 197 | v8::HandleScope handleScope(isolate); |
| 200 | 198 | |
| 201 | 199 | if (value->IsNullOrUndefined()) { |
| @@ -233,18 +231,18 @@ ScriptObjectV8Proxy::~ScriptObjectV8Proxy() { · 31 unmodified lines | ||
| 233 | 231 | } |
| 234 | 232 | } |
| 235 | 233 | _wasDestroyed = true; |
| 234 | + auto isolate = _engine->getIsolate(); | |
| 235 | + std::unique_ptr<ScriptEngine::ScriptEngineScopeGuard> guard; | |
| 236 | + if(!isolate->IsCurrent()) { | |
| 237 | + guard = _engine->getScopeGuard(); | |
| 238 | + } | |
| 239 | + Q_ASSERT(isolate->IsCurrent()); | |
| 236 | 240 | if (_ownsObject) { |
| 237 | − auto isolate = _engine->getIsolate(); | |
| 238 | − v8::Locker locker(isolate); | |
| 239 | − v8::Isolate::Scope isolateScope(isolate); | |
| 240 | 241 | v8::HandleScope handleScope(isolate); |
| 241 | 242 | _v8Object.Reset(); |
| 242 | 243 | QObject* qobject = _object; |
| 243 | 244 | if(qobject) qobject->deleteLater(); |
| 244 | 245 | } else { |
| 245 | − auto isolate = _engine->getIsolate(); | |
| 246 | − v8::Locker locker(isolate); | |
| 247 | − v8::Isolate::Scope isolateScope(isolate); | |
| 248 | 246 | v8::HandleScope handleScope(isolate); |
| 249 | 247 | if (_object) |
| 250 | 248 | qCDebug(scriptengine_v8) << "Deleting object proxy: " << name(); |
| @@ -264,8 +262,7 @@ void ScriptObjectV8Proxy::investigate() { · 13 unmodified lines | ||
| 264 | 262 | if (!qobject) return; |
| 265 | 263 | |
| 266 | 264 | auto isolate = _engine->getIsolate(); |
| 267 | − v8::Locker locker(isolate); | |
| 268 | − v8::Isolate::Scope isolateScope(isolate); | |
| 265 | + Q_ASSERT(isolate->IsCurrent()); | |
| 269 | 266 | v8::HandleScope handleScope(_engine->getIsolate()); |
| 270 | 267 | auto context = _engine->getContext(); |
| 271 | 268 | v8::Context::Scope contextScope(context); |
| @@ -426,8 +423,7 @@ QString ScriptObjectV8Proxy::name() const { · 154 unmodified lines | ||
| 426 | 423 | |
| 427 | 424 | ScriptObjectV8Proxy::QueryFlags ScriptObjectV8Proxy::queryProperty(const V8ScriptValue& object, const V8ScriptString& name, QueryFlags flags, uint* id) { |
| 428 | 425 | auto isolate = _engine->getIsolate(); |
| 429 | − v8::Locker locker(isolate); | |
| 430 | − v8::Isolate::Scope isolateScope(isolate); | |
| 426 | + Q_ASSERT(isolate->IsCurrent()); | |
| 431 | 427 | v8::HandleScope handleScope(isolate); |
| 432 | 428 | v8::Local<v8::Context> context = _engine->getContext(); |
| 433 | 429 | v8::Context::Scope contextScope(context); |
| @@ -588,8 +584,7 @@ void ScriptObjectV8Proxy::v8GetPropertyNames(const v8::PropertyCallbackInfo<v8:: · 154 unmodified lines | ||
| 588 | 584 | |
| 589 | 585 | v8::Local<v8::Array> ScriptObjectV8Proxy::getPropertyNames() { |
| 590 | 586 | auto isolate = _engine->getIsolate(); |
| 591 | − v8::Locker locker(isolate); | |
| 592 | − v8::Isolate::Scope isolateScope(isolate); | |
| 587 | + Q_ASSERT(isolate->IsCurrent()); | |
| 593 | 588 | v8::EscapableHandleScope handleScope(_engine->getIsolate()); |
| 594 | 589 | auto context = _engine->getContext(); |
| 595 | 590 | v8::Context::Scope contextScope(context); |
| @@ -621,8 +616,7 @@ v8::Local<v8::Array> ScriptObjectV8Proxy::getPropertyNames() { · 25 unmodified lines | ||
| 621 | 616 | |
| 622 | 617 | V8ScriptValue ScriptObjectV8Proxy::property(const V8ScriptValue& object, const V8ScriptString& name, uint id) { |
| 623 | 618 | auto isolate = _engine->getIsolate(); |
| 624 | − v8::Locker locker(isolate); | |
| 625 | − v8::Isolate::Scope isolateScope(isolate); | |
| 619 | + Q_ASSERT(isolate->IsCurrent()); | |
| 626 | 620 | v8::HandleScope handleScope(isolate); |
| 627 | 621 | auto context = _engine->getContext(); |
| 628 | 622 | v8::Context::Scope contextScope(context); |
| @@ -694,8 +688,7 @@ V8ScriptValue ScriptObjectV8Proxy::property(const V8ScriptValue& object, const V · 65 unmodified lines | ||
| 694 | 688 | |
| 695 | 689 | void ScriptObjectV8Proxy::setProperty(V8ScriptValue& object, const V8ScriptString& name, uint id, const V8ScriptValue& value) { |
| 696 | 690 | auto isolate = _engine->getIsolate(); |
| 697 | − v8::Locker locker(isolate); | |
| 698 | − v8::Isolate::Scope isolateScope(isolate); | |
| 691 | + Q_ASSERT(isolate->IsCurrent()); | |
| 699 | 692 | v8::HandleScope handleScope(isolate); |
| 700 | 693 | v8::Context::Scope contextScope(_engine->getContext()); |
| 701 | 694 | if (!(id & PROPERTY_TYPE)) return; |
| @@ -733,8 +726,7 @@ void ScriptObjectV8Proxy::setProperty(V8ScriptValue& object, const V8ScriptStrin · 31 unmodified lines | ||
| 733 | 726 | ScriptVariantV8Proxy::ScriptVariantV8Proxy(ScriptEngineV8* engine, const QVariant& variant, V8ScriptValue scriptProto, ScriptObjectV8Proxy* proto) : |
| 734 | 727 | _engine(engine), _variant(variant), _scriptProto(scriptProto), _proto(proto) { |
| 735 | 728 | auto isolate = engine->getIsolate(); |
| 736 | − v8::Locker locker(isolate); | |
| 737 | − v8::Isolate::Scope isolateScope(isolate); | |
| 729 | + Q_ASSERT(isolate->IsCurrent()); | |
| 738 | 730 | v8::HandleScope handleScope(isolate); |
| 739 | 731 | auto context = engine->getContext(); |
| 740 | 732 | v8::Context::Scope contextScope(context); |
| @@ -749,8 +741,7 @@ ScriptVariantV8Proxy::ScriptVariantV8Proxy(ScriptEngineV8* engine, const QVarian · 8 unmodified lines | ||
| 749 | 741 | |
| 750 | 742 | ScriptVariantV8Proxy::~ScriptVariantV8Proxy() { |
| 751 | 743 | auto isolate = _engine->getIsolate(); |
| 752 | − v8::Locker locker(isolate); | |
| 753 | − v8::Isolate::Scope isolateScope(isolate); | |
| 744 | + Q_ASSERT(isolate->IsCurrent()); | |
| 754 | 745 | v8::HandleScope handleScope(isolate); |
| 755 | 746 | // V8TODO: Add similar deletion handling as for object proxy |
| 756 | 747 | _v8Object.Reset(); |
| @@ -759,8 +750,7 @@ ScriptVariantV8Proxy::~ScriptVariantV8Proxy() { · 2 unmodified lines | ||
| 759 | 750 | V8ScriptValue ScriptVariantV8Proxy::newVariant(ScriptEngineV8* engine, const QVariant& variant, V8ScriptValue proto) { |
| 760 | 751 | qDebug() << "ScriptVariantV8Proxy::newVariant"; |
| 761 | 752 | auto isolate = engine->getIsolate(); |
| 762 | − v8::Locker locker(isolate); | |
| 763 | − v8::Isolate::Scope isolateScope(isolate); | |
| 753 | + Q_ASSERT(isolate->IsCurrent()); | |
| 764 | 754 | v8::HandleScope handleScope(isolate); |
| 765 | 755 | auto context = engine->getContext(); |
| 766 | 756 | v8::Context::Scope contextScope(context); |
| @@ -782,8 +772,7 @@ V8ScriptValue ScriptVariantV8Proxy::newVariant(ScriptEngineV8* engine, const QVa · 15 unmodified lines | ||
| 782 | 772 | |
| 783 | 773 | ScriptVariantV8Proxy* ScriptVariantV8Proxy::unwrapProxy(const V8ScriptValue& val) { |
| 784 | 774 | auto isolate = val.getEngine()->getIsolate(); |
| 785 | − v8::Locker locker(isolate); | |
| 786 | − v8::Isolate::Scope isolateScope(isolate); | |
| 775 | + Q_ASSERT(isolate->IsCurrent()); | |
| 787 | 776 | v8::HandleScope handleScope(isolate); |
| 788 | 777 | v8::Context::Scope contextScope(val.getEngine()->getContext()); |
| 789 | 778 | |
| @@ -802,8 +791,7 @@ ScriptVariantV8Proxy* ScriptVariantV8Proxy::unwrapProxy(const V8ScriptValue& val · 12 unmodified lines | ||
| 802 | 791 | } |
| 803 | 792 | |
| 804 | 793 | ScriptVariantV8Proxy* ScriptVariantV8Proxy::unwrapProxy(v8::Isolate* isolate, v8::Local<v8::Value> &value) { |
| 805 | − v8::Locker locker(isolate); | |
| 806 | − v8::Isolate::Scope isolateScope(isolate); | |
| 794 | + Q_ASSERT(isolate->IsCurrent()); | |
| 807 | 795 | v8::HandleScope handleScope(isolate); |
| 808 | 796 | |
| 809 | 797 | if (!value->IsObject()) { |
| @@ -820,8 +808,7 @@ ScriptVariantV8Proxy* ScriptVariantV8Proxy::unwrapProxy(v8::Isolate* isolate, v8 · 10 unmodified lines | ||
| 820 | 808 | } |
| 821 | 809 | |
| 822 | 810 | QVariant* ScriptVariantV8Proxy::unwrapQVariantPointer(v8::Isolate* isolate, const v8::Local<v8::Value> &value) { |
| 823 | − v8::Locker locker(isolate); | |
| 824 | − v8::Isolate::Scope isolateScope(isolate); | |
| 811 | + Q_ASSERT(isolate->IsCurrent()); | |
| 825 | 812 | v8::HandleScope handleScope(isolate); |
| 826 | 813 | |
| 827 | 814 | if (!value->IsObject()) { |
| @@ -924,8 +911,7 @@ ScriptMethodV8Proxy::ScriptMethodV8Proxy(ScriptEngineV8* engine, QObject* object · 96 unmodified lines | ||
| 924 | 911 | const QList<QMetaMethod>& metas, int numMaxParams) : |
| 925 | 912 | _numMaxParams(numMaxParams), _engine(engine), _object(object), /*_objectLifetime(lifetime),*/ _metas(metas) { |
| 926 | 913 | auto isolate = engine->getIsolate(); |
| 927 | − v8::Locker locker(isolate); | |
| 928 | − v8::Isolate::Scope isolateScope(isolate); | |
| 914 | + Q_ASSERT(isolate->IsCurrent()); | |
| 929 | 915 | v8::HandleScope handleScope(isolate); |
| 930 | 916 | v8::Context::Scope contextScope(engine->getContext()); |
| 931 | 917 | _objectLifetime.Reset(isolate, lifetime.get()); |
| @@ -934,8 +920,7 @@ ScriptMethodV8Proxy::ScriptMethodV8Proxy(ScriptEngineV8* engine, QObject* object · 2 unmodified lines | ||
| 934 | 920 | |
| 935 | 921 | ScriptMethodV8Proxy::~ScriptMethodV8Proxy() { |
| 936 | 922 | auto isolate = _engine->getIsolate(); |
| 937 | − v8::Locker locker(isolate); | |
| 938 | − v8::Isolate::Scope isolateScope(isolate); | |
| 923 | + Q_ASSERT(isolate->IsCurrent()); | |
| 939 | 924 | v8::HandleScope handleScope(isolate); |
| 940 | 925 | _objectLifetime.Reset(); |
| 941 | 926 | } |
| @@ -949,8 +934,7 @@ void ScriptMethodV8Proxy::weakHandleCallback(const v8::WeakCallbackInfo<ScriptMe · 7 unmodified lines | ||
| 949 | 934 | V8ScriptValue ScriptMethodV8Proxy::newMethod(ScriptEngineV8* engine, QObject* object, V8ScriptValue lifetime, |
| 950 | 935 | const QList<QMetaMethod>& metas, int numMaxParams) { |
| 951 | 936 | auto isolate = engine->getIsolate(); |
| 952 | − v8::Locker locker(isolate); | |
| 953 | − v8::Isolate::Scope isolateScope(isolate); | |
| 937 | + Q_ASSERT(isolate->IsCurrent()); | |
| 954 | 938 | v8::HandleScope handleScope(isolate); |
| 955 | 939 | auto context = engine->getContext(); |
| 956 | 940 | v8::Context::Scope contextScope(context); |
| @@ -975,8 +959,7 @@ QString ScriptMethodV8Proxy::fullName() const { · 18 unmodified lines | ||
| 975 | 959 | } |
| 976 | 960 | |
| 977 | 961 | void ScriptMethodV8Proxy::callback(const v8::FunctionCallbackInfo<v8::Value>& arguments) { |
| 978 | − v8::Locker locker(arguments.GetIsolate()); | |
| 979 | − v8::Isolate::Scope isolateScope(arguments.GetIsolate()); | |
| 962 | + Q_ASSERT(arguments.GetIsolate()->IsCurrent()); | |
| 980 | 963 | v8::HandleScope handleScope(arguments.GetIsolate()); |
| 981 | 964 | v8::Context::Scope contextScope(arguments.GetIsolate()->GetCurrentContext()); |
| 982 | 965 | if (!arguments.Data()->IsObject()) { |
| @@ -1001,8 +984,7 @@ void ScriptMethodV8Proxy::callback(const v8::FunctionCallbackInfo<v8::Value>& ar · 18 unmodified lines | ||
| 1001 | 984 | void ScriptMethodV8Proxy::call(const v8::FunctionCallbackInfo<v8::Value>& arguments) { |
| 1002 | 985 | v8::Isolate *isolate = arguments.GetIsolate(); |
| 1003 | 986 | Q_ASSERT(isolate == _engine->getIsolate()); |
| 1004 | − v8::Locker locker(isolate); | |
| 1005 | − v8::Isolate::Scope isolateScope(isolate); | |
| 987 | + Q_ASSERT(isolate->IsCurrent()); | |
| 1006 | 988 | v8::HandleScope handleScope(isolate); |
| 1007 | 989 | ContextScopeV8 contextScopeV8(_engine); |
| 1008 | 990 | auto context = _engine->getContext(); |
| @@ -1192,8 +1174,7 @@ void ScriptMethodV8Proxy::call(const v8::FunctionCallbackInfo<v8::Value>& argume · 183 unmodified lines | ||
| 1192 | 1174 | ScriptSignalV8Proxy::ScriptSignalV8Proxy(ScriptEngineV8* engine, QObject* object, V8ScriptValue lifetime, const QMetaMethod& meta) : |
| 1193 | 1175 | _engine(engine), _object(object), _meta(meta), _metaCallId(discoverMetaCallIdx()) { |
| 1194 | 1176 | auto isolate = _engine->getIsolate(); |
| 1195 | − v8::Locker locker(isolate); | |
| 1196 | − v8::Isolate::Scope isolateScope(isolate); | |
| 1177 | + Q_ASSERT(isolate->IsCurrent()); | |
| 1197 | 1178 | v8::HandleScope handleScope(isolate); |
| 1198 | 1179 | auto context = _engine->getContext(); |
| 1199 | 1180 | v8::Context::Scope contextScope(context); |
| @@ -1211,8 +1192,7 @@ ScriptSignalV8Proxy::~ScriptSignalV8Proxy() { · 11 unmodified lines | ||
| 1211 | 1192 | } |
| 1212 | 1193 | |
| 1213 | 1194 | auto isolate = _engine->getIsolate(); |
| 1214 | − v8::Locker locker(isolate); | |
| 1215 | − v8::Isolate::Scope isolateScope(isolate); | |
| 1195 | + Q_ASSERT(isolate->IsCurrent()); | |
| 1216 | 1196 | v8::HandleScope handleScope(isolate); |
| 1217 | 1197 | _objectLifetime.Reset(); |
| 1218 | 1198 | _v8Context.Reset(); |
| @@ -1260,8 +1240,7 @@ int ScriptSignalV8Proxy::qt_metacall(QMetaObject::Call call, int id, void** argu · 41 unmodified lines | ||
| 1260 | 1240 | #endif |
| 1261 | 1241 | |
| 1262 | 1242 | auto isolate = _engine->getIsolate(); |
| 1263 | − v8::Locker locker(isolate); | |
| 1264 | − v8::Isolate::Scope isolateScope(isolate); | |
| 1243 | + Q_ASSERT(isolate->IsCurrent()); | |
| 1265 | 1244 | |
| 1266 | 1245 | QList<Connection> connections; |
| 1267 | 1246 | withReadLock([&]{ |
| @@ -1348,9 +1327,9 @@ int ScriptSignalV8Proxy::discoverMetaCallIdx() { · 80 unmodified lines | ||
| 1348 | 1327 | |
| 1349 | 1328 | ScriptSignalV8Proxy::ConnectionList::iterator ScriptSignalV8Proxy::findConnection(V8ScriptValue thisObject, V8ScriptValue callback) { |
| 1350 | 1329 | auto iterOut = resultWithReadLock<ScriptSignalV8Proxy::ConnectionList::iterator>([&]{ |
| 1351 | − v8::Locker locker(_engine->getIsolate()); | |
| 1352 | − v8::Isolate::Scope isolateScope(_engine->getIsolate()); | |
| 1353 | − v8::HandleScope handleScope(_engine->getIsolate()); | |
| 1330 | + auto isolate = _engine->getIsolate(); | |
| 1331 | + Q_ASSERT(isolate->IsCurrent()); | |
| 1332 | + v8::HandleScope handleScope(isolate); | |
| 1354 | 1333 | v8::Context::Scope contextScope(_engine->getContext()); |
| 1355 | 1334 | ConnectionList::iterator iter; |
| 1356 | 1335 | for (iter = _connections.begin(); iter != _connections.end(); ++iter) { |
| @@ -1366,8 +1345,7 @@ ScriptSignalV8Proxy::ConnectionList::iterator ScriptSignalV8Proxy::findConnectio · 9 unmodified lines | ||
| 1366 | 1345 | |
| 1367 | 1346 | void ScriptSignalV8Proxy::connect(ScriptValue arg0, ScriptValue arg1) { |
| 1368 | 1347 | v8::Isolate *isolate = _engine->getIsolate(); |
| 1369 | − v8::Locker locker(isolate); | |
| 1370 | − v8::Isolate::Scope isolateScope(isolate); | |
| 1348 | + Q_ASSERT(isolate->IsCurrent()); | |
| 1371 | 1349 | v8::HandleScope handleScope(isolate); |
| 1372 | 1350 | auto context = _engine->getContext(); |
| 1373 | 1351 | v8::Context::Scope contextScope(context); |
| @@ -1496,8 +1474,7 @@ void ScriptSignalV8Proxy::disconnect(ScriptValue arg0, ScriptValue arg1) { · 122 unmodified lines | ||
| 1496 | 1474 | return; |
| 1497 | 1475 | } |
| 1498 | 1476 | } |
| 1499 | − v8::Locker locker(isolate); | |
| 1500 | − v8::Isolate::Scope isolateScope(isolate); | |
| 1477 | + Q_ASSERT(isolate->IsCurrent()); | |
| 1501 | 1478 | v8::HandleScope handleScope(isolate); |
| 1502 | 1479 | auto context = _engine->getContext(); |
| 1503 | 1480 | v8::Context::Scope contextScope(context); |