From 2027d2f752421bd22c436ef559a0929150af81f5 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Wed, 18 Oct 2017 17:13:54 +0800 Subject: [PATCH 1/5] fix fireball/issues/6475 --- .../android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java | 1 - 1 file changed, 1 deletion(-) diff --git a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java index 67e15a697d..09c34cc1c0 100644 --- a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java +++ b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java @@ -422,7 +422,6 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl mCurrentState = STATE_PLAYBACK_COMPLETED; mTargetState = STATE_PLAYBACK_COMPLETED; - release(true); if (mOnVideoEventListener != null) { mOnVideoEventListener.onVideoEvent(mViewTag,EVENT_COMPLETED); } From 60948a66c42afabb9ef06ed50fa432d48753c4f5 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 1 Nov 2017 00:20:48 +0800 Subject: [PATCH 2/5] Fix unscheduleAllCallbacks not working for schedules by key --- .../js-bindings/manual/cocos2d_specifics.cpp | 118 ++++++++---------- 1 file changed, 51 insertions(+), 67 deletions(-) diff --git a/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp b/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp index e9d44119c7..9dfa50ea55 100644 --- a/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp +++ b/native/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp @@ -1424,43 +1424,6 @@ bool js_cocos2dx_CCNode_scheduleUpdate(JSContext *cx, uint32_t argc, JS::Value * return false; } -bool js_cocos2dx_CCScheduler_unscheduleAllSelectorsForTarget(JSContext *cx, uint32_t argc, JS::Value *vp) -{ - JS::CallArgs args = JS::CallArgsFromVp(argc, vp); - JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); - js_proxy_t *proxy = jsb_get_js_proxy(cx, obj); - cocos2d::Scheduler* cobj = (cocos2d::Scheduler *)(proxy ? proxy->ptr : nullptr); - TEST_NATIVE_OBJECT(cx, cobj) - - if (argc == 1) { - do { - JS::RootedObject tmpObj(cx, args.get(0).toObjectOrNull()); - - auto arr = JSScheduleWrapper::getTargetForJSObject(cx, tmpObj); - // If there aren't any targets, just return true. - // Otherwise, the for loop will break immediately. - // It will lead to logic errors. - // For details to reproduce it, please refer to SchedulerTest/SchedulerUpdate. - if(! arr) return true; - - JSScheduleWrapper* wrapper = nullptr; - for(ssize_t i = 0; i < arr->size(); ++i) { - wrapper = (JSScheduleWrapper*)arr->at(i); - if(wrapper) { - cobj->unscheduleAllForTarget(wrapper); - } - } - JSScheduleWrapper::removeAllTargetsForJSObject(cx, tmpObj); - - } while (0); - - args.rval().setUndefined(); - return true; - } - JS_ReportErrorUTF8(cx, "wrong number of arguments: %d, was expecting %d", argc, 1); - return false; -} - bool js_CCScheduler_scheduleUpdateForTarget(JSContext *cx, uint32_t argc, JS::Value *vp) { if (argc >= 1) { @@ -1687,6 +1650,43 @@ bool js_CCScheduler_unscheduleCallbackForTarget(JSContext *cx, uint32_t argc, JS return false; } +bool js_cocos2dx_CCScheduler_unscheduleAllSelectorsForTarget(JSContext *cx, uint32_t argc, JS::Value *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(cx, obj); + cocos2d::Scheduler* cobj = (cocos2d::Scheduler *)(proxy ? proxy->ptr : nullptr); + TEST_NATIVE_OBJECT(cx, cobj) + + if (argc == 1) { + do { + JS::RootedObject targetObj(cx, args.get(0).toObjectOrNull()); + cobj->unscheduleAllForTarget(targetObj); + + auto arr = JSScheduleWrapper::getTargetForJSObject(cx, targetObj); + // If there aren't any targets, just return true. + // Otherwise, the for loop will break immediately. + // It will lead to logic errors. + // For details to reproduce it, please refer to SchedulerTest/SchedulerUpdate. + if(! arr) return true; + + JSScheduleWrapper* wrapper = nullptr; + for(ssize_t i = 0; i < arr->size(); ++i) { + wrapper = (JSScheduleWrapper*)arr->at(i); + if(wrapper) { + cobj->unscheduleAllForTarget(wrapper); + } + } + JSScheduleWrapper::removeAllTargetsForJSObject(cx, targetObj); + } while (0); + + args.rval().setUndefined(); + return true; + } + JS_ReportErrorUTF8(cx, "wrong number of arguments: %d, was expecting %d", argc, 1); + return false; +} + bool js_cocos2dx_CCScheduler_unscheduleAll(JSContext *cx, uint32_t argc, JS::Value *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -1737,8 +1737,10 @@ bool js_cocos2dx_CCScheduler_pauseTarget(JSContext *cx, uint32_t argc, JS::Value if (argc == 1) { do { - JS::RootedObject tmpObj(cx, args.get(0).toObjectOrNull()); - auto arr = JSScheduleWrapper::getTargetForJSObject(cx, tmpObj); + JS::RootedObject targetObj(cx, args.get(0).toObjectOrNull()); + sched->pauseTarget(targetObj); + + auto arr = JSScheduleWrapper::getTargetForJSObject(cx, targetObj); if(! arr) return true; for(ssize_t i = 0; i < arr->size(); ++i) { if(arr->at(i)) { @@ -1763,8 +1765,10 @@ bool js_cocos2dx_CCScheduler_resumeTarget(JSContext *cx, uint32_t argc, JS::Valu if (argc == 1) { do { - JS::RootedObject tmpObj(cx, args.get(0).toObjectOrNull()); - auto arr = JSScheduleWrapper::getTargetForJSObject(cx, tmpObj); + JS::RootedObject targetObj(cx, args.get(0).toObjectOrNull()); + sched->resumeTarget(targetObj); + + auto arr = JSScheduleWrapper::getTargetForJSObject(cx, targetObj); if(! arr) return true; for(ssize_t i = 0; i < arr->size(); ++i) { if(arr->at(i)) { @@ -1790,16 +1794,8 @@ bool js_cocos2dx_CCScheduler_isTargetPaused(JSContext *cx, uint32_t argc, JS::Va if (argc == 1) { bool ret = false; do { - JS::RootedObject tmpObj(cx, args.get(0).toObjectOrNull()); - auto arr = JSScheduleWrapper::getTargetForJSObject(cx, tmpObj); - if(! arr) return true; - for(ssize_t i = 0; i < arr->size(); ++i) { - if(arr->at(i)) { - ret = cobj->isTargetPaused(arr->at(i)) ? true : false; - // break directly since all targets have the same `pause` status. - break; - } - } + JS::RootedObject targetObj(cx, args.get(0).toObjectOrNull()); + ret = cobj->isTargetPaused(targetObj); } while (0); args.rval().set(JS::BooleanValue(ret)); return true; @@ -1819,24 +1815,12 @@ bool js_cocos2dx_CCScheduler_isScheduled(JSContext *cx, uint32_t argc, JS::Value if (argc == 2) { bool isScheduled = false; - JS::RootedObject funcObj(cx, args.get(0).toObjectOrNull()); + std::string key; + bool ok = jsval_to_std_string(cx, args.get(0), &key); + JSB_PRECONDITION2(ok, cx, false, "Error processing arguments"); JS::RootedObject tmpObj(cx, args.get(1).toObjectOrNull()); - auto arr = JSScheduleWrapper::getTargetForJSObject(cx, tmpObj); - if(! arr) { - args.rval().set(JS::BooleanValue(isScheduled)); - return true; - }; - JSScheduleWrapper* wrapper = nullptr; - JS::RootedObject wrapperFunc(cx); - for (ssize_t i = 0; i < arr->size(); ++i) { - wrapper = (JSScheduleWrapper*)arr->at(i); - wrapper->getJSCallback(cx, &wrapperFunc); - if(wrapper && funcObj.get() == wrapperFunc.get()) { - isScheduled = cobj->isScheduled(schedule_selector(JSScheduleWrapper::scheduleFunc), wrapper); - break; - } - } + isScheduled = cobj->isScheduled(key, tmpObj); args.rval().set(JS::BooleanValue(isScheduled)); return true; } From cc4061194476127ed49500d317e5944669e93498 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 2 Jan 2018 13:56:26 +0800 Subject: [PATCH 3/5] fixed #1041: Potential crash in invokeJSTouchOneByOneCallback. (#1043) And fixed potential invalid se::Object after invoking cc.director.getScheduler/getActionManager/getEventDispatcher, cc.SpriteFrame/Sprite.getTexture. Added hook functions in EventDispatcher, TextureCache to prevent using dangerous se::Object. Stop propagation for TouchOneByOne event should only affect current Touch point. Fixed updateListener may not be invoked. --- native/cocos/base/CCEventDispatcher.cpp | 55 ++++++-- native/cocos/base/CCEventDispatcher.h | 16 ++- native/cocos/renderer/CCTextureCache.cpp | 34 ++++- native/cocos/renderer/CCTextureCache.h | 14 +- .../manual/jsb_cocos2dx_manual.cpp | 130 ++++++++++++++---- .../js-bindings/script/jsb_cocos2d.js | 54 ++++++++ 6 files changed, 248 insertions(+), 55 deletions(-) diff --git a/native/cocos/base/CCEventDispatcher.cpp b/native/cocos/base/CCEventDispatcher.cpp index d458928f20..fdc9522b6a 100644 --- a/native/cocos/base/CCEventDispatcher.cpp +++ b/native/cocos/base/CCEventDispatcher.cpp @@ -191,12 +191,15 @@ void EventDispatcher::EventListenerVector::clear() EventDispatcher::EventDispatcher() : _inDispatch(0) -, _isEnabled(false) , _nodePriorityIndex(0) +, _isEnabled(false) { _toAddedListeners.reserve(50); _toRemovedListeners.reserve(50); + memset(_beforeDispatchEventHooks, 0, sizeof(_beforeDispatchEventHooks)); + memset(_afterDispatchEventHooks, 0, sizeof(_afterDispatchEventHooks)); + // fixed #4129: Mark the following listener IDs for internal use. // Therefore, internal listeners would not be cleaned when removeAllEventListeners is invoked. _internalCustomListenerIDs.insert(EVENT_COME_TO_FOREGROUND); @@ -803,6 +806,13 @@ void EventDispatcher::dispatchEvent(Event* event) if (!_isEnabled) return; + DispatchEventHook beforeDispatchHook = _beforeDispatchEventHooks[(int)event->getType()]; + DispatchEventHook afterDispatchHook = _afterDispatchEventHooks[(int)event->getType()]; + if (beforeDispatchHook != nullptr) + { + beforeDispatchHook(event); + } + updateDirtyFlagForSceneGraph(); DispatchGuard guard(_inDispatch); @@ -810,6 +820,11 @@ void EventDispatcher::dispatchEvent(Event* event) if (event->getType() == Event::Type::TOUCH) { dispatchTouchEvent(static_cast(event)); + updateListeners(event); + if (afterDispatchHook != nullptr) + { + afterDispatchHook(event); + } return; } @@ -832,6 +847,11 @@ void EventDispatcher::dispatchEvent(Event* event) updateListeners(event); } + + if (afterDispatchHook != nullptr) + { + afterDispatchHook(event); + } } void EventDispatcher::dispatchCustomEvent(const std::string &eventName, void *optionalUserData) @@ -873,6 +893,16 @@ bool EventDispatcher::hasEventListener(const EventListener::ListenerID& listener return true; } +void EventDispatcher::setBeforeDispatchEventHook(Event::Type type, const DispatchEventHook& hook) +{ + _beforeDispatchEventHooks[(int)type] = hook; +} + +void EventDispatcher::setAfterDispatchEventHook(Event::Type type, const DispatchEventHook& hook) +{ + _afterDispatchEventHooks[(int)type] = hook; +} + void EventDispatcher::dispatchTouchEvent(EventTouch* event) { sortEventListeners(EventListenerTouchOneByOne::LISTENER_ID); @@ -967,13 +997,6 @@ void EventDispatcher::dispatchTouchEvent(EventTouch* event) } } - // If the event was stopped, return directly. - if (event->isStopped()) - { - updateListeners(event); - return true; - } - CCASSERT((*touchesIter)->getID() == (*mutableTouchesIter)->getID(), "touchesIter ID should be equal to mutableTouchesIter's ID."); @@ -987,15 +1010,20 @@ void EventDispatcher::dispatchTouchEvent(EventTouch* event) return true; } + if (event->isStopped()) + { + // TouchOneByOne event is special, touchEvent->stopPropagation() should only affect current touch. + // Therefore, reset it to non-stopped state for next touch event handling and return true to stop + // current touch event propagation. + event->_isStopped = false; + return true; + } + return false; }; // dispatchEventToListeners(oneByOneListeners, onTouchEvent); - if (event->isStopped()) - { - return; - } if (!isSwallowed) ++mutableTouchesIter; @@ -1050,7 +1078,6 @@ void EventDispatcher::dispatchTouchEvent(EventTouch* event) // If the event was stopped, return directly. if (event->isStopped()) { - updateListeners(event); return true; } @@ -1063,8 +1090,6 @@ void EventDispatcher::dispatchTouchEvent(EventTouch* event) return; } } - - updateListeners(event); } void EventDispatcher::updateListeners(Event* event) diff --git a/native/cocos/base/CCEventDispatcher.h b/native/cocos/base/CCEventDispatcher.h index 0925c54abd..a40d54f9cd 100644 --- a/native/cocos/base/CCEventDispatcher.h +++ b/native/cocos/base/CCEventDispatcher.h @@ -185,6 +185,10 @@ public: */ bool hasEventListener(const EventListener::ListenerID& listenerID) const; + using DispatchEventHook = void (*)(Event*); + void setBeforeDispatchEventHook(Event::Type type, const DispatchEventHook& hook); + void setAfterDispatchEventHook(Event::Type type, const DispatchEventHook& hook); + ///////////////////////////////////////////// /** Constructor of EventDispatcher. @@ -328,15 +332,17 @@ protected: /** The nodes were associated with scene graph based priority listeners */ std::set _dirtyNodes; + std::set _internalCustomListenerIDs; + + static const int MAX_EVENT_TYPE = (int)Event::Type::CUSTOM + 1; + DispatchEventHook _beforeDispatchEventHooks[MAX_EVENT_TYPE]; + DispatchEventHook _afterDispatchEventHooks[MAX_EVENT_TYPE]; + /** Whether the dispatcher is dispatching event */ int _inDispatch; - + int _nodePriorityIndex; /** Whether to enable dispatching event */ bool _isEnabled; - - int _nodePriorityIndex; - - std::set _internalCustomListenerIDs; }; diff --git a/native/cocos/renderer/CCTextureCache.cpp b/native/cocos/renderer/CCTextureCache.cpp index bf915006d1..a9e1a745f2 100644 --- a/native/cocos/renderer/CCTextureCache.cpp +++ b/native/cocos/renderer/CCTextureCache.cpp @@ -56,8 +56,10 @@ TextureCache* TextureCache::getInstance() TextureCache::TextureCache() : _loadingThread(nullptr) -, _needQuit(false) +, _textureCreateHook(nullptr) +, _textureDestroyHook(nullptr) , _asyncRefCount(0) +, _needQuit(false) { } @@ -298,6 +300,9 @@ void TextureCache::addImageAsyncCallBack(float dt) texture->retain(); texture->autorelease(); + + if (_textureCreateHook != nullptr) + _textureCreateHook(this, texture); } else { texture = nullptr; CCLOG("cocos2d: failed to call TextureCache::addImageAsync(%s)", asyncStruct->filename.c_str()); @@ -360,6 +365,9 @@ Texture2D * TextureCache::addImage(const std::string &path) // texture already retained, no need to re-retain it _textures.insert( std::make_pair(fullpath, texture) ); + if (_textureCreateHook != nullptr) + _textureCreateHook(this, texture); + //parse 9-patch info this->parseNinePatchImage(image, texture, path); } @@ -410,6 +418,9 @@ Texture2D* TextureCache::addImage(Image *image, const std::string &key) texture->retain(); texture->autorelease(); + + if (_textureCreateHook != nullptr) + _textureCreateHook(this, texture); } else { @@ -483,6 +494,9 @@ cocos2d::Vector TextureCache::getAllTextures() const void TextureCache::removeAllTextures() { for( auto it=_textures.begin(); it!=_textures.end(); ++it ) { + if (_textureDestroyHook != nullptr) + _textureDestroyHook(this, it->second); + (it->second)->release(); } _textures.clear(); @@ -494,6 +508,8 @@ void TextureCache::removeUnusedTextures() Texture2D *tex = it->second; if( tex->getReferenceCount() == 1 ) { CCLOG("cocos2d: TextureCache: removing unused texture: %s", it->first.c_str()); + if (_textureDestroyHook != nullptr) + _textureDestroyHook(this, tex); tex->release(); it = _textures.erase(it); @@ -514,6 +530,9 @@ void TextureCache::removeTexture(Texture2D* texture) for( auto it=_textures.cbegin(); it!=_textures.cend(); /* nothing */ ) { if( it->second == texture ) { + if (_textureDestroyHook != nullptr) + _textureDestroyHook(this, texture); + it->second->release(); it = _textures.erase(it); break; @@ -534,6 +553,9 @@ void TextureCache::removeTextureForKey(const std::string &textureKeyName) } if( it != _textures.end() ) { + if (_textureDestroyHook != nullptr) + _textureDestroyHook(this, it->second); + (it->second)->release(); _textures.erase(it); } @@ -657,6 +679,16 @@ void TextureCache::renameTextureWithKey(const std::string& srcName, const std::s } } +void TextureCache::setTextureCreateHook(TextureLifeCycleHook hook) +{ + _textureCreateHook = hook; +} + +void TextureCache::setTextureDestroyHook(TextureLifeCycleHook hook) +{ + _textureDestroyHook = hook; +} + #if CC_ENABLE_CACHE_TEXTURE_DATA std::list VolatileTextureMgr::_textures; diff --git a/native/cocos/renderer/CCTextureCache.h b/native/cocos/renderer/CCTextureCache.h index 52fdebd64b..73885d3050 100644 --- a/native/cocos/renderer/CCTextureCache.h +++ b/native/cocos/renderer/CCTextureCache.h @@ -212,6 +212,9 @@ public: */ void renameTextureWithKey(const std::string& srcName, const std::string& dstName); + using TextureLifeCycleHook = void (*)(TextureCache*, Texture2D*); + void setTextureCreateHook(TextureLifeCycleHook hook); + void setTextureDestroyHook(TextureLifeCycleHook hook); private: void addImageAsyncCallBack(float dt); @@ -221,8 +224,6 @@ public: protected: struct AsyncStruct; - std::thread* _loadingThread; - std::deque _asyncStructQueue; std::deque _requestQueue; std::deque _responseQueue; @@ -231,12 +232,15 @@ protected: std::mutex _responseMutex; std::condition_variable _sleepCondition; + std::unordered_map _textures; - bool _needQuit; + std::thread* _loadingThread; + + TextureLifeCycleHook _textureCreateHook; + TextureLifeCycleHook _textureDestroyHook; int _asyncRefCount; - - std::unordered_map _textures; + bool _needQuit; }; #if CC_ENABLE_CACHE_TEXTURE_DATA diff --git a/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp index 869b078df5..7afded54c4 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp @@ -11,6 +11,7 @@ #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_conversions.hpp" #include "cocos/scripting/js-bindings/manual/jsb_global.h" +#include "cocos/scripting/js-bindings/manual/ScriptingCore.h" #include "cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp" #include "cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp" @@ -341,7 +342,7 @@ static bool invokeJSMouseCallback(EventListenerMouse* listener, const char* func SE_PRECONDITION2(ok, false, "invokeJSMouseCallback convert arg1 failed!"); if (!fromCache) - { + { // EventMouse is holded by CCGLView-desktop forever. So just root it once to make it never be garbage collected. arg1Val.toObject()->root(); } argArr.push_back(std::move(arg1Val)); @@ -433,28 +434,20 @@ static bool invokeJSTouchOneByOneCallback(EventListenerTouchOneByOne* listener, se::ValueArray argArr; argArr.reserve(2); se::Value arg1Val; - se::Object* arg1Obj = nullptr; do { ok = native_ptr_to_seval(touch, &arg1Val); SE_PRECONDITION_ERROR_BREAK(ok, "invokeJSTouchOneByOneCallback convert arg1 failed!"); - - arg1Obj = arg1Val.toObject(); - - if (type == TOUCH_ONE_BY_ONE_ON_TOUCH_BEGAN) - { - arg1Obj->root(); - } - argArr.push_back(std::move(arg1Val)); + bool fromCache = true; se::Value arg2Val; - bool eventFromCache = true; - ok = native_ptr_to_seval(event, &arg2Val, &eventFromCache); + ok = native_ptr_to_seval(event, &arg2Val, &fromCache); SE_PRECONDITION_ERROR_BREAK(ok, "invokeJSTouchOneByOneCallback convert arg2 failed!"); - if (!eventFromCache) + if (!fromCache) { + // EventTouch is holded by CCGLView forever. So just root it once to make it never be garbage collected. arg2Val.toObject()->root(); } @@ -468,18 +461,6 @@ static bool invokeJSTouchOneByOneCallback(EventListenerTouchOneByOne* listener, } while(false); - if (type == TOUCH_ONE_BY_ONE_ON_TOUCH_BEGAN) - { - if (!(retVal->isBoolean() && retVal->toBoolean())) - { - arg1Obj->unroot(); - } - } - else if (type == TOUCH_ONE_BY_ONE_ON_TOUCH_ENDED || type == TOUCH_ONE_BY_ONE_ON_TOUCH_CANCELLED) - { - arg1Obj->unroot(); - } - return ok; } @@ -553,14 +534,16 @@ static bool invokeJSTouchAllAtOnceCallback(EventListenerTouchAllAtOnce* listener SE_PRECONDITION2(ok, false, "invokeJSTouchAllAtOnceCallback convert arg1 failed!"); argArr.push_back(std::move(arg1Val)); + bool fromCache = true; se::Value arg2Val; - bool eventFromCache = true; - ok = native_ptr_to_seval(event, &arg2Val, &eventFromCache); + ok = native_ptr_to_seval(event, &arg2Val, &fromCache); SE_PRECONDITION2(ok, false, "invokeJSTouchAllAtOnceCallback convert arg2 failed!"); - if (!eventFromCache) + if (!fromCache) { + // EventTouch is holded by CCGLView forever. So just root it once to make it never be garbage collected. arg2Val.toObject()->root(); } + argArr.push_back(std::move(arg2Val)); ok = funcVal.toObject()->call(argArr, listenerObj, retVal); @@ -787,7 +770,7 @@ static bool js_EventListenerCustom_create(se::State& s) se::Value funcVal = args[1]; assert(funcVal.isObject() && funcVal.toObject()->isFunction()); - auto ret = new EventListenerCustom(); + auto ret = new (std::nothrow) EventListenerCustom(); ret->init(eventName, [ret, funcVal](EventCustom* event){ @@ -836,6 +819,89 @@ static bool js_EventListenerCustom_create(se::State& s) } SE_BIND_FUNC(js_EventListenerCustom_create) +static void onBeforeDispatchTouchEvent(Event* event) +{ + if (event->getType() == Event::Type::TOUCH) + { + EventTouch* touchEvent = static_cast(event); + if (touchEvent->getEventCode() == EventTouch::EventCode::BEGAN) + { + bool fromCache = true; + const auto& touches = touchEvent->getTouches(); + for (auto&& touch : touches) + { + se::Value touchVal; + native_ptr_to_seval(touch, __jsb_cocos2d_Touch_class, &touchVal, &fromCache); + assert(!fromCache); + touchVal.toObject()->root(); + } + } + } +} + +static void onAfterDispatchTouchEvent(Event* event) +{ + if (event->getType() == Event::Type::TOUCH) + { + EventTouch* touchEvent = static_cast(event); + EventTouch::EventCode code = touchEvent->getEventCode(); + if (code == EventTouch::EventCode::ENDED || code == EventTouch::EventCode::CANCELLED) + { + const auto& touches = touchEvent->getTouches(); + for (auto&& touch : touches) + { + auto iter = se::NativePtrToObjectMap::find(touch); + assert(iter != se::NativePtrToObjectMap::end()); + iter->second->unroot(); + } + } + } +} + +static void onTextureCreate(TextureCache* cache, Texture2D* texture) +{ + auto iterOwner = se::NativePtrToObjectMap::find(cache); + if (iterOwner == se::NativePtrToObjectMap::end()) + { + assert(false); + return; + } + + se::Value textureVal; + bool fromCache = false; + native_ptr_to_seval(texture, __jsb_cocos2d_Texture2D_class, &textureVal, &fromCache); + if (!fromCache && textureVal.isObject()) + { + iterOwner->second->attachObject(textureVal.toObject()); + } + else + { + assert(false); + } +} + +static void onTextureDestroy(TextureCache* cache, Texture2D* texture) +{ + auto iterOwner = se::NativePtrToObjectMap::find(cache); + if (iterOwner == se::NativePtrToObjectMap::end()) + { + assert(false); + return; + } + + se::Value textureVal; + bool fromCache = false; + native_ptr_to_seval(texture, __jsb_cocos2d_Texture2D_class, &textureVal, &fromCache); + if (fromCache && textureVal.isObject()) + { + iterOwner->second->detachObject(textureVal.toObject()); + } + else + { + assert(false); + } +} + static bool register_eventlistener(se::Object* obj) { se::Value v; @@ -867,6 +933,12 @@ static bool register_eventlistener(se::Object* obj) assert(v.isObject()); v.toObject()->defineFunction("create", _SE(js_EventListenerCustom_create)); + Director::getInstance()->getEventDispatcher()->setBeforeDispatchEventHook(Event::Type::TOUCH, onBeforeDispatchTouchEvent); + Director::getInstance()->getEventDispatcher()->setAfterDispatchEventHook(Event::Type::TOUCH, onAfterDispatchTouchEvent); + + Director::getInstance()->getTextureCache()->setTextureCreateHook(onTextureCreate); + Director::getInstance()->getTextureCache()->setTextureDestroyHook(onTextureDestroy); + se::ScriptEngine::getInstance()->clearException(); return true; diff --git a/native/cocos/scripting/js-bindings/script/jsb_cocos2d.js b/native/cocos/scripting/js-bindings/script/jsb_cocos2d.js index 572ae53c66..833973a05f 100644 --- a/native/cocos/scripting/js-bindings/script/jsb_cocos2d.js +++ b/native/cocos/scripting/js-bindings/script/jsb_cocos2d.js @@ -1089,3 +1089,57 @@ cc.GLProgram.prototype.setUniformLocationWithMatrix4fv = function(){ tempArray.push(4); this.setUniformLocationWithMatrixfvUnion.apply(this, tempArray); }; + +// Hack for the lifecycle of JS objects +cc.Director.prototype._jsb_getScheduler = cc.Director.prototype.getScheduler; +cc.Director.prototype.getScheduler = function() { + var scheduler = this._jsb_getScheduler(); + if (this._jsb_scheduler != scheduler) + { + this._jsb_scheduler = scheduler; + } + return scheduler; +} + +cc.Director.prototype._jsb_getActionManager = cc.Director.prototype.getActionManager; +cc.Director.prototype.getActionManager = function() { + var actionManager = this._jsb_getActionManager(); + if (this._jsb_actionManager != actionManager) + { + this._jsb_actionManager = actionManager; + } + return actionManager; +} + +cc.Director.prototype._jsb_getEventDispatcher = cc.Director.prototype.getEventDispatcher; +cc.Director.prototype.getEventDispatcher = function() { + var eventDispatcher = this._jsb_getEventDispatcher(); + if (this._jsb_eventDispatcher != eventDispatcher) + { + this._jsb_eventDispatcher = eventDispatcher; + } + return eventDispatcher; +} + +cc.SpriteFrame.prototype._jsb_getTexture = cc.SpriteFrame.prototype.getTexture; +cc.SpriteFrame.prototype.getTexture = function() { + var texture = this._jsb_getTexture(); + if (this._jsb_texture != texture) + { + this._jsb_texture = texture; + } + return texture; +} + +cc.Sprite.prototype._jsb_getTexture = cc.Sprite.prototype.getTexture; +cc.Sprite.prototype.getTexture = function() { + var texture = this._jsb_getTexture(); + if (this._jsb_texture != texture) + { + this._jsb_texture = texture; + } + return texture; +} + +// + From 3fa48d4a11cdc3cc17de1bdd9a44ef54bbeb03c9 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 8 Jan 2018 15:31:20 +0800 Subject: [PATCH 4/5] Adds missing se::autoHandleScope. (#1057) --- .../scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp index 7afded54c4..21c36da5f8 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp @@ -821,6 +821,7 @@ SE_BIND_FUNC(js_EventListenerCustom_create) static void onBeforeDispatchTouchEvent(Event* event) { + se::AutoHandleScope hs; if (event->getType() == Event::Type::TOUCH) { EventTouch* touchEvent = static_cast(event); @@ -841,6 +842,7 @@ static void onBeforeDispatchTouchEvent(Event* event) static void onAfterDispatchTouchEvent(Event* event) { + se::AutoHandleScope hs; if (event->getType() == Event::Type::TOUCH) { EventTouch* touchEvent = static_cast(event); @@ -860,6 +862,7 @@ static void onAfterDispatchTouchEvent(Event* event) static void onTextureCreate(TextureCache* cache, Texture2D* texture) { + se::AutoHandleScope hs; auto iterOwner = se::NativePtrToObjectMap::find(cache); if (iterOwner == se::NativePtrToObjectMap::end()) { @@ -882,6 +885,7 @@ static void onTextureCreate(TextureCache* cache, Texture2D* texture) static void onTextureDestroy(TextureCache* cache, Texture2D* texture) { + se::AutoHandleScope hs; auto iterOwner = se::NativePtrToObjectMap::find(cache); if (iterOwner == se::NativePtrToObjectMap::end()) { From 1b0965803cfa0dccb0fa5d8e1c03d6b73bf4ccee Mon Sep 17 00:00:00 2001 From: Knox Date: Tue, 16 Jan 2018 18:30:13 +0800 Subject: [PATCH 5/5] fix CocosAnalytics issue for fireball/issues/6730 (#1058) --- .../android/java/libs/libcocosanalytics.jar | Bin 31561 -> 31590 bytes .../cocos2dx/lib/Cocos2dxGLSurfaceView.java | 8 ++++++-- .../js-bindings/script/jsb_cocosanalytics.js | 12 ++++++++++++ .../proj.ios_mac/ios/AppController.mm | 8 ++++++-- .../proj.ios_mac/ios/AppController.mm | 8 ++++++-- .../proj.ios_mac/ios/AppController.mm | 8 ++++++-- 6 files changed, 36 insertions(+), 8 deletions(-) diff --git a/native/cocos/platform/android/java/libs/libcocosanalytics.jar b/native/cocos/platform/android/java/libs/libcocosanalytics.jar index 29e665f8f595d6cb73024d2c7021dadc942dce42..5ed690948f45899d0003bb11b255a07c69f3d0a1 100644 GIT binary patch delta 6404 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 XkIzfk@}DgJC{Qqn;HCGUr}F;*!xGB_ diff --git a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java index 4385eaf085..c33b89288c 100644 --- a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java +++ b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java @@ -179,7 +179,9 @@ public class Cocos2dxGLSurfaceView extends GLSurfaceView { @Override public void run() { Cocos2dxGLSurfaceView.this.mCocos2dxRenderer.handleOnResume(); - CAAgent.onResume(Cocos2dxGLSurfaceView.this.getContext()); + if (CAAgent.isInited()) { + CAAgent.onResume(Cocos2dxGLSurfaceView.this.getContext()); + } } }); } @@ -190,7 +192,9 @@ public class Cocos2dxGLSurfaceView extends GLSurfaceView { @Override public void run() { Cocos2dxGLSurfaceView.this.mCocos2dxRenderer.handleOnPause(); - CAAgent.onPause(Cocos2dxGLSurfaceView.this.getContext()); + if (CAAgent.isInited()) { + CAAgent.onPause(Cocos2dxGLSurfaceView.this.getContext()); + } } }); this.setRenderMode(RENDERMODE_WHEN_DIRTY); diff --git a/native/cocos/scripting/js-bindings/script/jsb_cocosanalytics.js b/native/cocos/scripting/js-bindings/script/jsb_cocosanalytics.js index 7e15691d6b..9673d66db9 100644 --- a/native/cocos/scripting/js-bindings/script/jsb_cocosanalytics.js +++ b/native/cocos/scripting/js-bindings/script/jsb_cocosanalytics.js @@ -36,6 +36,10 @@ if (platform === sys.ANDROID) { } }; + cocosAnalytics.isInited = function() { + return jsb.reflection.callStaticMethod(cls_CAAgent, "isInited", "()Z"); + }; + cocosAnalytics.enableDebug = function(enabled) { jsb.reflection.callStaticMethod(cls_CAAgent, "enableDebug", "(Z)V", @@ -326,6 +330,10 @@ if (platform === sys.ANDROID) { } }; + cocosAnalytics.isInited = function() { + return jsb.reflection.callStaticMethod(cls_CAAgent, "isInited"); + }; + cocosAnalytics.enableDebug = function(enabled) { jsb.reflection.callStaticMethod(cls_CAAgent, "enableDebug:", @@ -594,6 +602,10 @@ if (platform === sys.ANDROID) { console.log("Cocos Analytics module isn't available on this platform!"); }; + cocosAnalytics.isInited = function() { + return false; + }; + cocosAnalytics.enableDebug = function(enabled) { }; diff --git a/native/templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm b/native/templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm index 4d63a42d0e..de05bea003 100755 --- a/native/templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm +++ b/native/templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm @@ -117,7 +117,9 @@ static AppDelegate* s_sharedApplication = nullptr; If your application supports background execution, called instead of applicationWillTerminate: when the user quits. */ cocos2d::Application::getInstance()->applicationDidEnterBackground(); - [CAAgent onPause]; + if (CAAgent.isInited) { + [CAAgent onPause]; + } } - (void)applicationWillEnterForeground:(UIApplication *)application { @@ -129,7 +131,9 @@ static AppDelegate* s_sharedApplication = nullptr; if (glview == currentView) { cocos2d::Application::getInstance()->applicationWillEnterForeground(); } - [CAAgent onResume]; + if (CAAgent.isInited) { + [CAAgent onResume]; + } } - (void)applicationWillTerminate:(UIApplication *)application { diff --git a/native/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm b/native/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm index 4d63a42d0e..de05bea003 100755 --- a/native/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm +++ b/native/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm @@ -117,7 +117,9 @@ static AppDelegate* s_sharedApplication = nullptr; If your application supports background execution, called instead of applicationWillTerminate: when the user quits. */ cocos2d::Application::getInstance()->applicationDidEnterBackground(); - [CAAgent onPause]; + if (CAAgent.isInited) { + [CAAgent onPause]; + } } - (void)applicationWillEnterForeground:(UIApplication *)application { @@ -129,7 +131,9 @@ static AppDelegate* s_sharedApplication = nullptr; if (glview == currentView) { cocos2d::Application::getInstance()->applicationWillEnterForeground(); } - [CAAgent onResume]; + if (CAAgent.isInited) { + [CAAgent onResume]; + } } - (void)applicationWillTerminate:(UIApplication *)application { diff --git a/native/templates/js-template-link/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm b/native/templates/js-template-link/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm index 4d63a42d0e..de05bea003 100755 --- a/native/templates/js-template-link/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm +++ b/native/templates/js-template-link/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm @@ -117,7 +117,9 @@ static AppDelegate* s_sharedApplication = nullptr; If your application supports background execution, called instead of applicationWillTerminate: when the user quits. */ cocos2d::Application::getInstance()->applicationDidEnterBackground(); - [CAAgent onPause]; + if (CAAgent.isInited) { + [CAAgent onPause]; + } } - (void)applicationWillEnterForeground:(UIApplication *)application { @@ -129,7 +131,9 @@ static AppDelegate* s_sharedApplication = nullptr; if (glview == currentView) { cocos2d::Application::getInstance()->applicationWillEnterForeground(); } - [CAAgent onResume]; + if (CAAgent.isInited) { + [CAAgent onResume]; + } } - (void)applicationWillTerminate:(UIApplication *)application {