diff --git a/native/cocos/scripting/js-bindings/jswrapper/chakracore/Object.cpp b/native/cocos/scripting/js-bindings/jswrapper/chakracore/Object.cpp index 2d28cff801..a312f3caf5 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/chakracore/Object.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/chakracore/Object.cpp @@ -662,12 +662,12 @@ namespace se { _privateData = data; } - void Object::clearPrivateData() + void Object::clearPrivateData(bool clearMapping) { if (_privateData != nullptr) { - void* data = getPrivateData(); - NativePtrToObjectMap::erase(data); + if (clearMapping) + NativePtrToObjectMap::erase(_privateData); internal::clearPrivate(_obj); _privateData = nullptr; } diff --git a/native/cocos/scripting/js-bindings/jswrapper/chakracore/Object.hpp b/native/cocos/scripting/js-bindings/jswrapper/chakracore/Object.hpp index 9076149ce7..e0b744a9c2 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/chakracore/Object.hpp +++ b/native/cocos/scripting/js-bindings/jswrapper/chakracore/Object.hpp @@ -255,11 +255,10 @@ namespace se { void* getPrivateData() const; /** - * @brief Roots an object from garbage collection. - * @note Use this method when you want to store an object in a global or on the heap, where the garbage collector will not be able to discover your reference to it. - * An object may be rooted multiple times and must be unrooted an equal number of times before becoming eligible for garbage collection. + * @brief Clears private data of an object. + * @param clearMapping Whether to clear the mapping of native object & se::Object. */ - void clearPrivateData(); + void clearPrivateData(bool clearMapping = true); /** * @brief Roots an object from garbage collection. diff --git a/native/cocos/scripting/js-bindings/jswrapper/jsc/Object.hpp b/native/cocos/scripting/js-bindings/jswrapper/jsc/Object.hpp index 38584f75e7..cd69e7ed89 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/jsc/Object.hpp +++ b/native/cocos/scripting/js-bindings/jswrapper/jsc/Object.hpp @@ -257,8 +257,9 @@ namespace se { /** * @brief Clears private data of an object. + * @param clearMapping Whether to clear the mapping of native object & se::Object. */ - void clearPrivateData(); + void clearPrivateData(bool clearMapping = true); /** * @brief Roots an object from garbage collection. diff --git a/native/cocos/scripting/js-bindings/jswrapper/jsc/Object.mm b/native/cocos/scripting/js-bindings/jswrapper/jsc/Object.mm index b566e9046f..861a5cde5f 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/jsc/Object.mm +++ b/native/cocos/scripting/js-bindings/jswrapper/jsc/Object.mm @@ -949,12 +949,12 @@ namespace se { _privateData = data; } - void Object::clearPrivateData() + void Object::clearPrivateData(bool clearMapping) { if (_privateData != nullptr) { - void* data = getPrivateData(); - NativePtrToObjectMap::erase(data); + if (clearMapping) + NativePtrToObjectMap::erase(_privateData); internal::clearPrivate(_obj); _privateData = nullptr; } diff --git a/native/cocos/scripting/js-bindings/jswrapper/sm/Object.cpp b/native/cocos/scripting/js-bindings/jswrapper/sm/Object.cpp index cdf1128dac..e729b2bce4 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/sm/Object.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/sm/Object.cpp @@ -487,12 +487,12 @@ namespace se { _privateData = data; } - void Object::clearPrivateData() + void Object::clearPrivateData(bool clearMapping) { if (_privateData != nullptr) { - void* data = getPrivateData(); - NativePtrToObjectMap::erase(data); + if (clearMapping) + NativePtrToObjectMap::erase(_privateData); JS::RootedObject obj(__cx, _getJSObject()); internal::clearPrivate(__cx, obj); _privateData = nullptr; diff --git a/native/cocos/scripting/js-bindings/jswrapper/sm/Object.hpp b/native/cocos/scripting/js-bindings/jswrapper/sm/Object.hpp index 8b1b5a42a2..1d1f0ae6a4 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/sm/Object.hpp +++ b/native/cocos/scripting/js-bindings/jswrapper/sm/Object.hpp @@ -257,8 +257,9 @@ namespace se { /** * @brief Clears private data of an object. + * @param clearMapping Whether to clear the mapping of native object & se::Object. */ - void clearPrivateData(); + void clearPrivateData(bool clearMapping = true); /** * @brief Roots an object from garbage collection. diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/Object.cpp b/native/cocos/scripting/js-bindings/jswrapper/v8/Object.cpp index 233cf2be67..bee32c14ea 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/Object.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/Object.cpp @@ -451,12 +451,12 @@ namespace se { return _privateData; } - void Object::clearPrivateData() + void Object::clearPrivateData(bool clearMapping) { if (_privateData != nullptr) { - void* data = getPrivateData(); - NativePtrToObjectMap::erase(data); + if (clearMapping) + NativePtrToObjectMap::erase(_privateData); internal::clearPrivate(__isolate, _obj); _privateData = nullptr; } diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/Object.hpp b/native/cocos/scripting/js-bindings/jswrapper/v8/Object.hpp index dbd200e6b0..3f67a8ad3e 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/Object.hpp +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/Object.hpp @@ -262,8 +262,9 @@ namespace se { /** * @brief Clears private data of an object. + * @param clearMapping Whether to clear the mapping of native object & se::Object. */ - void clearPrivateData(); + void clearPrivateData(bool clearMapping = true); /** * @brief Roots an object from garbage collection. diff --git a/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp b/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp index 80020cadee..f5eab3039d 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp @@ -265,32 +265,6 @@ bool TechniqueParameter_to_seval(const cocos2d::renderer::Technique::Parameter& bool std_vector_TechniqueParameter_to_seval(const std::vector& v, se::Value* ret); bool std_vector_EffectDefine_to_seval(const std::vector& v, se::Value* ret); -template -bool recreate_seval_by_native_ptr(typename std::enable_if::value,T>::type* v, se::Class* cls, se::Value* ret) -{ - assert(ret != nullptr); - assert(cls != nullptr); - if (v == nullptr) - { - ret->setNull(); - return true; - } - - auto iter = se::NativePtrToObjectMap::find(v); - if (iter != se::NativePtrToObjectMap::end()) - { - se::Object* seObj = iter->second; - seObj->clearPrivateData(); - seObj->decRef(); - } - - se::Object* obj = se::Object::createObjectWithClass(cls); - ret->setObject(obj, true); - obj->setPrivateData(v); - - return true; -} - template bool native_ptr_to_seval(typename std::enable_if::value,T>::type* v, se::Value* ret, bool* isReturnCachedValue = nullptr) { diff --git a/native/cocos/scripting/js-bindings/manual/jsb_global.cpp b/native/cocos/scripting/js-bindings/manual/jsb_global.cpp index 86eed0895f..ee7a42f42b 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_global.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_global.cpp @@ -558,6 +558,7 @@ SE_BIND_FUNC(JSB_cleanScript) static bool JSB_core_restartVM(se::State& s) { + //TODO: release AudioEngine, waiting HttpClient & WebSocket threads to exit. Application::getInstance()->restart(); return true; }