diff --git a/native/cocos/scripting/js-bindings/jswrapper/Object.hpp b/native/cocos/scripting/js-bindings/jswrapper/Object.hpp index d9c7cbac4d..ae6a03b087 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/Object.hpp +++ b/native/cocos/scripting/js-bindings/jswrapper/Object.hpp @@ -18,45 +18,3 @@ #include "chakracore/Object.hpp" #endif -namespace se { - - class StackRootedObject - { - public: - StackRootedObject(Object* obj) - { - assert(obj != nullptr); - if (!obj->isRooted()) - { - _obj = obj; - _obj->addRef(); - LOGD("%s, switchToRooted!", __FUNCTION__); - _obj->switchToRooted(); - } - else - { - _obj = nullptr; - } - } - - ~StackRootedObject() - { - if (_obj != nullptr) - { - _obj->switchToUnrooted(); - _obj->release(); - } - } - - private: - StackRootedObject(const StackRootedObject&) = delete; - StackRootedObject(StackRootedObject&&) = delete; - StackRootedObject& operator=(const StackRootedObject&) = delete; - StackRootedObject& operator=(StackRootedObject&&) = delete; - void* operator new(size_t size) = delete; - - Object* _obj; - }; - - -} // namespace se { diff --git a/native/cocos/scripting/js-bindings/jswrapper/sm/Object.cpp b/native/cocos/scripting/js-bindings/jswrapper/sm/Object.cpp index dbb7c1ac13..5d55ce2393 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/sm/Object.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/sm/Object.cpp @@ -751,30 +751,6 @@ namespace se { return JS_CallFunctionName(__cx, jsbObj, "unregisterNativeRef", args, &rval); } - bool Object::detachAllChildren() - { - JSObject* ownerObj = _getJSObject(); - if (ownerObj == nullptr) - { - LOGD("%s: try to detach on invalid object, owner: %p\n", __FUNCTION__, ownerObj); - return false; - } - - JS::RootedValue valOwner(__cx, JS::ObjectValue(*ownerObj)); - - JS::RootedObject jsbObj(__cx); - JS::RootedObject globalObj(__cx, ScriptEngine::getInstance()->getGlobalObject()->_getJSObject()); - get_or_create_js_obj(__cx, globalObj, "jsb", &jsbObj); - - JS::AutoValueVector args(__cx); - args.resize(1); - args[0].set(valOwner); - - JS::RootedValue rval(__cx); - - return JS_CallFunctionName(__cx, jsbObj, "unregisterAllNativeRefs", args, &rval); - } - } // namespace se { #endif // SCRIPT_ENGINE_SM diff --git a/native/cocos/scripting/js-bindings/jswrapper/sm/Object.hpp b/native/cocos/scripting/js-bindings/jswrapper/sm/Object.hpp index 69c10e9a33..26d93f22fe 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/sm/Object.hpp +++ b/native/cocos/scripting/js-bindings/jswrapper/sm/Object.hpp @@ -86,7 +86,7 @@ namespace se { bool isSame(Object* o) const; bool attachChild(Object* child); bool detachChild(Object* child); - bool detachAllChildren(); + private: static void setContext(JSContext* cx); diff --git a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp index cd3718872e..8b2351c02d 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp @@ -179,6 +179,7 @@ bool seval_to_std_string(const se::Value& v, std::string* ret) *ret = v.toStringForce(); return true; } + ret->clear(); return false; } diff --git a/native/cocos/scripting/js-bindings/manual/jsb_node.cpp b/native/cocos/scripting/js-bindings/manual/jsb_node.cpp index 284ae34dd0..edb03e9813 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_node.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_node.cpp @@ -393,7 +393,7 @@ public: } ~UnscheduleNotifier() { - printf("~UnscheduleNotifier, target: %p, key: %s\n", _target, _key.c_str()); + LOGD("~UnscheduleNotifier, target: %p, key: %s\n", _target, _key.c_str()); se::ScriptEngine::getInstance()->clearException(); se::AutoHandleScope hs; @@ -733,7 +733,7 @@ static bool Scheduler_unscheduleCommon(Scheduler* scheduler, const se::Value& js } else { - printf("WARNING: %s not found\n", __FUNCTION__); + LOGD("WARNING: %s not found\n", __FUNCTION__); } return true; } @@ -1111,7 +1111,6 @@ static bool js_cocos2dx_Scheduler_unschedule(se::State& s) { se::Value jsFuncOrKey = args[0]; se::Value jsTarget = args[1]; -// s.thisObject()->detachChild(jsTarget.toObject()); Scheduler* cobj = (Scheduler*)s.nativeThisObject(); return Scheduler_unscheduleCommon(cobj, jsTarget, jsFuncOrKey); } @@ -1129,7 +1128,6 @@ static bool js_cocos2dx_Scheduler_unscheduleAllForTarget(se::State& s) if (argc == 1) { se::Value target = args[0]; -// s.thisObject()->detachChild(target.toObject()); return Scheduler_unscheduleAllCallbacksCommon(cobj, target.toObject(), true); } @@ -1146,7 +1144,7 @@ static bool js_cocos2dx_Scheduler_unscheduleAllCallbacks(se::State& s) if (argc == 0) { removeAllScheduleAndUpdate(true); -// s.thisObject()->detachAllChildren(); + Scheduler* cobj = (Scheduler*)s.nativeThisObject(); cobj->unscheduleAll(); CCLOG("After unschedule all callbacks"); diff --git a/native/cocos/scripting/js-bindings/proj.android/Android.mk b/native/cocos/scripting/js-bindings/proj.android/Android.mk index bb6cd186b0..3ef87f4bbc 100644 --- a/native/cocos/scripting/js-bindings/proj.android/Android.mk +++ b/native/cocos/scripting/js-bindings/proj.android/Android.mk @@ -56,7 +56,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual \ $(LOCAL_PATH)/../../../audio/include \ $(LOCAL_PATH)/../../../storage \ $(LOCAL_PATH)/../../../../extensions \ - $(LOCAL_PATH)/../../../../external/android/armeabi/include/spidermonkey \ $(LOCAL_PATH)/../../../editor-support/spine \ $(LOCAL_PATH)/../../../editor-support/cocosbuilder \ $(LOCAL_PATH)/../../../editor-support/cocostudio \ diff --git a/native/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj b/native/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj index 1d0b40575f..609a958962 100644 --- a/native/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj +++ b/native/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj @@ -19,12 +19,17 @@ 1A119E9C18BDF19200352BAA /* jsb_cocos2dx_spine_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A119E3B18BDF19200352BAA /* jsb_cocos2dx_spine_auto.cpp */; }; 1A119E9D18BDF19200352BAA /* jsb_cocos2dx_spine_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E3C18BDF19200352BAA /* jsb_cocos2dx_spine_auto.hpp */; }; 1A119E9E18BDF19200352BAA /* jsb_cocos2dx_spine_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1A119E3C18BDF19200352BAA /* jsb_cocos2dx_spine_auto.hpp */; }; - 1AB0647A1EF9647F0061E1AF /* libbmalloc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB064771EF9647F0061E1AF /* libbmalloc.a */; }; - 1AB0647C1EF9647F0061E1AF /* libWTF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB064791EF9647F0061E1AF /* libWTF.a */; }; + 1A4E8E811F00CB0200F30872 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A4E8E801F00CB0200F30872 /* JavaScriptCore.framework */; }; + 1A4E8E831F00E84C00F30872 /* libChakraCoreStatic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A4E8E821F00E84C00F30872 /* libChakraCoreStatic.a */; }; 1AB5E62B18D05BC80088DAA4 /* jsb_cocos2dx_ui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB5E62918D05BC80088DAA4 /* jsb_cocos2dx_ui_auto.cpp */; }; 1AB5E62C18D05BC80088DAA4 /* jsb_cocos2dx_ui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB5E62918D05BC80088DAA4 /* jsb_cocos2dx_ui_auto.cpp */; }; 1AB5E62D18D05BC80088DAA4 /* jsb_cocos2dx_ui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AB5E62A18D05BC80088DAA4 /* jsb_cocos2dx_ui_auto.hpp */; }; 1AB5E62E18D05BC80088DAA4 /* jsb_cocos2dx_ui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AB5E62A18D05BC80088DAA4 /* jsb_cocos2dx_ui_auto.hpp */; }; + 1AB64A011F035628000C28A7 /* libv8_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB649FC1F035628000C28A7 /* libv8_base.a */; }; + 1AB64A021F035628000C28A7 /* libv8_libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB649FD1F035628000C28A7 /* libv8_libbase.a */; }; + 1AB64A031F035628000C28A7 /* libv8_libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB649FE1F035628000C28A7 /* libv8_libplatform.a */; }; + 1AB64A041F035628000C28A7 /* libv8_libsampler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB649FF1F035628000C28A7 /* libv8_libsampler.a */; }; + 1AB64A051F035628000C28A7 /* libv8_nosnapshot.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB64A001F035628000C28A7 /* libv8_nosnapshot.a */; }; 1AC0650A1F00A62A009EC214 /* libmozglue.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC065091F00A62A009EC214 /* libmozglue.a */; }; 1AC0650C1F00A926009EC214 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC0650B1F00A926009EC214 /* JavaScriptCore.framework */; }; 1AFD36341EF115100097DBB1 /* Base.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFD35FA1EF115100097DBB1 /* Base.h */; }; @@ -210,6 +215,8 @@ 1A119E3618BDF19200352BAA /* jsb_cocos2dx_extension_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jsb_cocos2dx_extension_auto.hpp; sourceTree = ""; }; 1A119E3B18BDF19200352BAA /* jsb_cocos2dx_spine_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsb_cocos2dx_spine_auto.cpp; sourceTree = ""; }; 1A119E3C18BDF19200352BAA /* jsb_cocos2dx_spine_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jsb_cocos2dx_spine_auto.hpp; sourceTree = ""; }; + 1A4E8E801F00CB0200F30872 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; + 1A4E8E821F00E84C00F30872 /* libChakraCoreStatic.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libChakraCoreStatic.a; path = ../../../../../ChakraCore/out/Debug/lib/libChakraCoreStatic.a; sourceTree = ""; }; 1A5410A418B785A10016A3AF /* libjscocos2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjscocos2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1A5410A518B785A10016A3AF /* libjscocos2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjscocos2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1AB064771EF9647F0061E1AF /* libbmalloc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbmalloc.a; path = ../../../../../JavaScriptCore/build/lib/libbmalloc.a; sourceTree = ""; }; @@ -217,6 +224,11 @@ 1AB064791EF9647F0061E1AF /* libWTF.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libWTF.a; path = ../../../../../JavaScriptCore/build/lib/libWTF.a; sourceTree = ""; }; 1AB5E62918D05BC80088DAA4 /* jsb_cocos2dx_ui_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jsb_cocos2dx_ui_auto.cpp; sourceTree = ""; }; 1AB5E62A18D05BC80088DAA4 /* jsb_cocos2dx_ui_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jsb_cocos2dx_ui_auto.hpp; sourceTree = ""; }; + 1AB649FC1F035628000C28A7 /* libv8_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libv8_base.a; path = ../../../../external/mac/libs/libv8_base.a; sourceTree = ""; }; + 1AB649FD1F035628000C28A7 /* libv8_libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libv8_libbase.a; path = ../../../../external/mac/libs/libv8_libbase.a; sourceTree = ""; }; + 1AB649FE1F035628000C28A7 /* libv8_libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libv8_libplatform.a; path = ../../../../external/mac/libs/libv8_libplatform.a; sourceTree = ""; }; + 1AB649FF1F035628000C28A7 /* libv8_libsampler.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libv8_libsampler.a; path = ../../../../external/mac/libs/libv8_libsampler.a; sourceTree = ""; }; + 1AB64A001F035628000C28A7 /* libv8_nosnapshot.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libv8_nosnapshot.a; path = ../../../../external/mac/libs/libv8_nosnapshot.a; sourceTree = ""; }; 1AC065091F00A62A009EC214 /* libmozglue.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmozglue.a; path = ../../../../external/ios/libs/libmozglue.a; sourceTree = ""; }; 1AC0650B1F00A926009EC214 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; 1AFD35FA1EF115100097DBB1 /* Base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base.h; sourceTree = ""; }; @@ -317,10 +329,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 1A4E8E811F00CB0200F30872 /* JavaScriptCore.framework in Frameworks */, ED3057C71BEC7C8C0083C3ED /* libjs_static.a in Frameworks */, 1AFD37041EF116CB0097DBB1 /* libmozglue.a in Frameworks */, - 1AB0647A1EF9647F0061E1AF /* libbmalloc.a in Frameworks */, - 1AB0647C1EF9647F0061E1AF /* libWTF.a in Frameworks */, + 1A4E8E831F00E84C00F30872 /* libChakraCoreStatic.a in Frameworks */, + 1AB64A011F035628000C28A7 /* libv8_base.a in Frameworks */, + 1AB64A021F035628000C28A7 /* libv8_libbase.a in Frameworks */, + 1AB64A031F035628000C28A7 /* libv8_libplatform.a in Frameworks */, + 1AB64A041F035628000C28A7 /* libv8_libsampler.a in Frameworks */, + 1AB64A051F035628000C28A7 /* libv8_nosnapshot.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -505,6 +522,13 @@ 1AFD37021EF116CA0097DBB1 /* Frameworks */ = { isa = PBXGroup; children = ( + 1AB649FC1F035628000C28A7 /* libv8_base.a */, + 1AB649FD1F035628000C28A7 /* libv8_libbase.a */, + 1AB649FE1F035628000C28A7 /* libv8_libplatform.a */, + 1AB649FF1F035628000C28A7 /* libv8_libsampler.a */, + 1AB64A001F035628000C28A7 /* libv8_nosnapshot.a */, + 1A4E8E821F00E84C00F30872 /* libChakraCoreStatic.a */, + 1A4E8E801F00CB0200F30872 /* JavaScriptCore.framework */, 1AC0650B1F00A926009EC214 /* JavaScriptCore.framework */, 1AC065091F00A62A009EC214 /* libmozglue.a */, 1AB064771EF9647F0061E1AF /* libbmalloc.a */, @@ -908,9 +932,9 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../../../../external/mac/libs", - "\"$(SRCROOT)/../../../../../JavaScriptCore/build/lib\"", + "\"$(SRCROOT)/../../../../../ChakraCore/out/Debug/lib\"", ); - SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../../external/mac/include/JavaScriptCore"; + SYSTEM_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../../external/mac/include $(SRCROOT)/../../../../external/sources $(SRCROOT)/../../../../cocos/platform/mac $(SRCROOT)/../../../../external/mac/include/spidermonkey $(SRCROOT)/../../../../external/mac/include/v8 $(SRCROOT)/../../../../external/mac/include/chakracore"; }; name = Debug; @@ -930,9 +954,9 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../../../../external/mac/libs", - "\"$(SRCROOT)/../../../../../JavaScriptCore/build/lib\"", + "\"$(SRCROOT)/../../../../../ChakraCore/out/Debug/lib\"", ); - SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../../external/mac/include/JavaScriptCore"; + SYSTEM_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../../external/mac/include $(SRCROOT)/../../../../external/sources $(SRCROOT)/../../../../cocos/platform/mac $(SRCROOT)/../../../../external/mac/include/spidermonkey $(SRCROOT)/../../../../external/mac/include/v8 $(SRCROOT)/../../../../external/mac/include/chakracore"; }; name = Release;