Fix app crash in cocos2dx-JS if garbage collection runs between TouchStart and TouchEnd event. #19191
+8
−8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t and TouchEnd events.
vaibhavgohel
changed the title
|
LGTM, thanks for this contribution. |
|
GOOD JOB! I really need this fix!! |
stevetranby
added a commit
to stevetranby/cocos2d-x
that referenced
this pull request
Dec 3, 2018
STEVE: - removed js/lua stuff * commit 'fde4e6387d6e6e19badb41c8ba2aa365045b68ec': (35 commits) [js tests] add index, simplify (cocos2d#19218) update cocos console (cocos2d#19216) [js interval tests] use labelBMFont instead of labelTTF, improve preformance (cocos2d#19215) [lua test]FontTest resize page (cocos2d#19213) [lua test]Extensions scroll pos error (cocos2d#19214) cpp-tests/Bugs add titles & lua bugs/1174 decrease loop count (cocos2d#19205) [cpp-tests] improve items location of part cases (cocos2d#19210) [cmake] fix iOS xcode property setting failed (cocos2d#19208) Node:Particle3D effects abnormal, texture incorrect (cocos2d#19204) [js-tests mac/Android] Extensions Test-> Websocket->Send text, fix cafile (cocos2d#19202) [cpp-test] DownloaderTest url expires (cocos2d#19203) [android tests] setup project name in AndroidStudio dashboard (cocos2d#19200) [lua test-android]WebViewTest button overlapping (cocos2d#19201) [cpp-test mac] 19：Extension->4SocketIOTest->Open SocketIO Endpoint crashfix (cocos2d#19199) [cpp test-Android、mac]46：Node：Sprite3D->25 crash (cocos2d#19198) [cpp test-Android]20：FileUtils/2 change title (cocos2d#19197) [cpp test-windows]46/26 clear mode crash (cocos2d#19195) [js-test win32]XMLHttpRequest gzip deflate & fix xcode project include paths (cocos2d#19194) [js-test] Chipmunk Tests/ Chipmunk Release Tests crash fix (cocos2d#19193) Fix crash in cocos2dx-JS if garbage collection runs between Touchstart and TouchEnd events. (cocos2d#19191) ... # Conflicts: # build/cocos2d_tests.xcodeproj/project.pbxproj # cocos/2d/CCSpriteFrameCache.cpp # cocos/platform/CCFileUtils.cpp # cocos/platform/CCGLView.h # cocos/platform/android/CCFileUtils-android.cpp # cocos/platform/desktop/CCGLViewImpl-desktop.h # cocos/platform/mac/CCApplication-mac.mm # cocos/scripting/js-bindings/manual/ScriptingCore.cpp # cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp # cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.h # cocos/scripting/lua-bindings/auto/api/Label.lua # cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp # cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp # cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua # templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-hdpi/ic_launcher.png # templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-mdpi/ic_launcher.png # templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-20.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-29.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-40.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-50.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-57.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-72.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-76.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/LaunchScreenBackground.png # templates/js-template-default/res/HelloWorld.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-hdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-mdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-20.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-29.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-40.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-50.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-57.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-72.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-76.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/LaunchScreenBackground.png # templates/lua-template-default/res/HelloWorld.png # tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp # tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h # tests/game-controller-test/Resources/ipad/A.png # tests/game-controller-test/Resources/ipad/B.png # tests/game-controller-test/Resources/ipad/CloseNormal.png # tests/game-controller-test/Resources/ipad/CloseSelected.png # tests/game-controller-test/Resources/ipad/L1.png # tests/game-controller-test/Resources/ipad/L2.png # tests/game-controller-test/Resources/ipad/R1.png # tests/game-controller-test/Resources/ipad/R2.png # tests/game-controller-test/Resources/ipad/X.png # tests/game-controller-test/Resources/ipad/Y.png # tests/game-controller-test/Resources/ipad/controller-1.png # tests/game-controller-test/Resources/ipad/controller-2.png # tests/game-controller-test/Resources/ipad/dPad.png # tests/game-controller-test/Resources/ipad/dpad-key.png # tests/game-controller-test/Resources/ipad/joystick.png # tests/game-controller-test/Resources/ipadhd/A.png # tests/game-controller-test/Resources/ipadhd/B.png # tests/game-controller-test/Resources/ipadhd/CloseNormal.png # tests/game-controller-test/Resources/ipadhd/CloseSelected.png # tests/game-controller-test/Resources/ipadhd/L1.png # tests/game-controller-test/Resources/ipadhd/L2.png # tests/game-controller-test/Resources/ipadhd/R1.png # tests/game-controller-test/Resources/ipadhd/R2.png # tests/game-controller-test/Resources/ipadhd/X.png # tests/game-controller-test/Resources/ipadhd/Y.png # tests/game-controller-test/Resources/ipadhd/controller-1.png # tests/game-controller-test/Resources/ipadhd/controller-2.png # tests/game-controller-test/Resources/ipadhd/dPad.png # tests/game-controller-test/Resources/ipadhd/joystick.png # tests/game-controller-test/Resources/iphone/CloseNormal.png # tests/game-controller-test/Resources/iphone/CloseSelected.png # tests/game-controller-test/proj.ios/[email protected] # tests/game-controller-test/proj.ios/[email protected] # tests/game-controller-test/proj.ios/[email protected] # tests/game-controller-test/proj.ios/Default.png # tests/game-controller-test/proj.ios/[email protected] # tests/game-controller-test/proj.ios/Icon-100.png # tests/game-controller-test/proj.ios/Icon-114.png # tests/game-controller-test/proj.ios/Icon-120.png # tests/game-controller-test/proj.ios/Icon-144.png # tests/game-controller-test/proj.ios/Icon-152.png # tests/game-controller-test/proj.ios/Icon-40.png # tests/game-controller-test/proj.ios/Icon-57.png # tests/game-controller-test/proj.ios/Icon-58.png # tests/game-controller-test/proj.ios/Icon-72.png # tests/game-controller-test/proj.ios/Icon-76.png # tests/game-controller-test/proj.ios/Icon-80.png # tests/js-tests/project/Classes/js_DrawNode3D_bindings.cpp # tests/js-tests/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png # tests/js-tests/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png # tests/js-tests/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # tests/js-tests/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # tests/js-tests/project/proj.android/settings.gradle # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-20.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-29.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-40.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-50.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-57.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-72.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-76.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/LaunchScreenBackground.png # tests/js-tests/resjs/ccb/animated-grossini.png # tests/js-tests/resjs/ccb/btn-a-0.png # tests/js-tests/resjs/ccb/btn-a-1.png # tests/js-tests/resjs/ccb/btn-a-2.png # tests/js-tests/resjs/ccb/btn-b-0.png # tests/js-tests/resjs/ccb/btn-b-1.png # tests/js-tests/resjs/ccb/btn-b-2.png # tests/js-tests/resjs/ccb/btn-back-0.png # tests/js-tests/resjs/ccb/btn-back-1.png # tests/js-tests/resjs/ccb/btn-test-0.png # tests/js-tests/resjs/ccb/btn-test-1.png # tests/js-tests/resjs/ccb/btn-test-2.png # tests/js-tests/resjs/ccb/burst.png # tests/js-tests/resjs/ccb/ccbParticleStars.png # tests/js-tests/resjs/ccb/grossini-generic.png # tests/js-tests/resjs/ccb/jungle-left.png # tests/js-tests/resjs/ccb/jungle-right.png # tests/js-tests/resjs/ccb/jungle.png # tests/js-tests/resjs/ccb/logo-icon.png # tests/js-tests/resjs/ccb/logo.png # tests/js-tests/resjs/ccb/markerfelt24shadow.png # tests/js-tests/resjs/ccb/particle-fire.png # tests/js-tests/resjs/ccb/particle-smoke.png # tests/js-tests/resjs/ccb/particle-snow.png # tests/js-tests/resjs/ccb/particle-stars.png # tests/js-tests/resjs/ccb/scale-9-demo.png # tests/js-tests/src/ChipmunkTest/ChipmunkTest.js # tests/js-tests/src/ExtensionsTest/NetworkTest/WebSocketTest.js # tests/js-tests/src/IntervalTest/IntervalTest.js # tests/js-tests/src/tests-main.js # tests/lua-empty-test/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png # tests/lua-empty-test/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png # tests/lua-empty-test/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # tests/lua-empty-test/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # tests/lua-empty-test/project/proj.android/settings.gradle # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-20.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-29.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-40.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-50.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-57.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-72.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-76.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/LaunchScreenBackground.png # tests/lua-empty-test/project/proj.mac/main.cpp # tests/lua-empty-test/res/crop.png # tests/lua-empty-test/res/dog.png # tests/lua-empty-test/res/land.png # tests/lua-empty-test/res/menu1.png # tests/lua-empty-test/res/menu2.png # tests/lua-game-controller-test/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png # tests/lua-game-controller-test/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png # tests/lua-game-controller-test/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # tests/lua-game-controller-test/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # tests/lua-game-controller-test/project/proj.android/settings.gradle # tests/lua-game-controller-test/project/proj.ios/[email protected] # tests/lua-game-controller-test/project/proj.ios/[email protected] # tests/lua-game-controller-test/project/proj.ios/[email protected] # tests/lua-game-controller-test/project/proj.ios/Default.png # tests/lua-game-controller-test/project/proj.ios/[email protected] # tests/lua-game-controller-test/project/proj.ios/Icon-114.png # tests/lua-game-controller-test/project/proj.ios/Icon-120.png # tests/lua-game-controller-test/project/proj.ios/Icon-144.png # tests/lua-game-controller-test/project/proj.ios/Icon-152.png # tests/lua-game-controller-test/project/proj.ios/Icon-57.png # tests/lua-game-controller-test/project/proj.ios/Icon-72.png # tests/lua-game-controller-test/project/proj.ios/Icon-76.png # tests/lua-tests/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png # tests/lua-tests/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png # tests/lua-tests/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # tests/lua-tests/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # tests/lua-tests/project/proj.android/settings.gradle # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-20.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-29.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-40.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-50.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-57.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-72.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-76.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/LaunchScreenBackground.png # tests/lua-tests/res/cocosbuilderRes/ccb/animated-grossini.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-a-0.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-a-1.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-a-2.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-b-0.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-b-1.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-b-2.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-back-0.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-back-1.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-test-0.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-test-1.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-test-2.png # tests/lua-tests/res/cocosbuilderRes/ccb/burst.png # tests/lua-tests/res/cocosbuilderRes/ccb/ccbParticleStars.png # tests/lua-tests/res/cocosbuilderRes/ccb/grossini-generic.png # tests/lua-tests/res/cocosbuilderRes/ccb/jungle-left.png # tests/lua-tests/res/cocosbuilderRes/ccb/jungle-right.png # tests/lua-tests/res/cocosbuilderRes/ccb/jungle.png # tests/lua-tests/res/cocosbuilderRes/ccb/logo-icon.png # tests/lua-tests/res/cocosbuilderRes/ccb/logo.png # tests/lua-tests/res/cocosbuilderRes/ccb/markerfelt24shadow.png # tests/lua-tests/res/cocosbuilderRes/ccb/particle-fire.png # tests/lua-tests/res/cocosbuilderRes/ccb/particle-smoke.png # tests/lua-tests/res/cocosbuilderRes/ccb/particle-snow.png # tests/lua-tests/res/cocosbuilderRes/ccb/particle-stars.png # tests/lua-tests/res/cocosbuilderRes/ccb/scale-9-demo.png # tests/lua-tests/src/BugsTest/BugsTest.lua # tests/lua-tests/src/ExtensionTest/ExtensionTest.lua # tests/lua-tests/src/FontTest/FontTest.lua # tests/lua-tests/src/WebViewTest/WebViewTest.lua # tests/lua-tests/src/mainMenu.lua # tests/performance-tests/Resources/CloseNormal.png # tests/performance-tests/Resources/CloseSelected.png # tests/performance-tests/Resources/Images/PlanetCute-1024x1024.png # tests/performance-tests/Resources/Images/b1.png # tests/performance-tests/Resources/Images/b2.png # tests/performance-tests/Resources/Images/close.png # tests/performance-tests/Resources/Images/f1.png # tests/performance-tests/Resources/Images/f2.png # tests/performance-tests/Resources/Images/fire.png # tests/performance-tests/Resources/Images/grossini.png # tests/performance-tests/Resources/Images/grossini_dance_01.png # tests/performance-tests/Resources/Images/grossini_dance_02.png # tests/performance-tests/Resources/Images/grossini_dance_03.png # tests/performance-tests/Resources/Images/grossini_dance_04.png # tests/performance-tests/Resources/Images/grossini_dance_05.png # tests/performance-tests/Resources/Images/grossini_dance_06.png # tests/performance-tests/Resources/Images/grossini_dance_07.png # tests/performance-tests/Resources/Images/grossini_dance_08.png # tests/performance-tests/Resources/Images/grossini_dance_09.png # tests/performance-tests/Resources/Images/grossini_dance_10.png # tests/performance-tests/Resources/Images/grossini_dance_11.png # tests/performance-tests/Resources/Images/grossini_dance_12.png # tests/performance-tests/Resources/Images/grossini_dance_13.png # tests/performance-tests/Resources/Images/grossini_dance_14.png # tests/performance-tests/Resources/Images/grossini_dance_atlas.png # tests/performance-tests/Resources/Images/grossini_polygon.png # tests/performance-tests/Resources/Images/grossini_quad.png # tests/performance-tests/Resources/Images/grossinis_sister1.png # tests/performance-tests/Resources/Images/grossinis_sister1_sp.png # tests/performance-tests/Resources/Images/grossinis_sister2.png # tests/performance-tests/Resources/Images/grossinis_sister2_sp.png # tests/performance-tests/Resources/Images/landscape-1024x1024.png # tests/performance-tests/Resources/Images/r1.png # tests/performance-tests/Resources/Images/r2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-7.png # tests/performance-tests/Resources/Images/spritesheet1.png # tests/performance-tests/Resources/Images/test_image.png # tests/performance-tests/Resources/Images/texture1024x1024.png # tests/performance-tests/Resources/Images/texture512x512.png # tests/performance-tests/Resources/Particle3D/textures/crate6.png # tests/performance-tests/Resources/Particle3D/textures/interpolate.png # tests/performance-tests/Resources/Particle3D/textures/mp_fire_02_2x2.png # tests/performance-tests/Resources/Particle3D/textures/pu_barrel_01.png # tests/performance-tests/Resources/Particle3D/textures/pu_barrel_02.png # tests/performance-tests/Resources/Particle3D/textures/pu_bbal.png # tests/performance-tests/Resources/Particle3D/textures/pu_beam_01.png # tests/performance-tests/Resources/Particle3D/textures/pu_beam_02.png # tests/performance-tests/Resources/Particle3D/textures/pu_circle.png # tests/performance-tests/Resources/Particle3D/textures/pu_dirt_256x512.png # tests/performance-tests/Resources/Particle3D/textures/pu_dot_03_64x64.png # tests/performance-tests/Resources/Particle3D/textures/pu_fire_01_64x64.png # tests/performance-tests/Resources/Particle3D/textures/pu_flame.png # tests/performance-tests/Resources/Particle3D/textures/pu_flare.png # tests/performance-tests/Resources/Particle3D/textures/pu_flare_12_256x256.png # tests/performance-tests/Resources/Particle3D/textures/pu_green_ball.png # tests/performance-tests/Resources/Particle3D/textures/pu_hart.png # tests/performance-tests/Resources/Particle3D/textures/pu_lightning_20x64.png # tests/performance-tests/Resources/Particle3D/textures/pu_nucleus.png # tests/performance-tests/Resources/Particle3D/textures/pu_rain.png # tests/performance-tests/Resources/Particle3D/textures/pu_rain_01.png # tests/performance-tests/Resources/Particle3D/textures/pu_ribbontrail.png # tests/performance-tests/Resources/Particle3D/textures/pu_sand_336x330.png # tests/performance-tests/Resources/Particle3D/textures/pu_smoke_02_128x128.png # tests/performance-tests/Resources/Particle3D/textures/pu_smoke_brown_336x330.png # tests/performance-tests/Resources/Particle3D/textures/pump_atlas_smoke.png # tests/performance-tests/Resources/Particle3D/textures/pump_biohazzard.png # tests/performance-tests/Resources/Particle3D/textures/pump_bubble.png # tests/performance-tests/Resources/Particle3D/textures/pump_bubble_blurred.png # tests/performance-tests/Resources/Particle3D/textures/pump_celticknot.png # tests/performance-tests/Resources/Particle3D/textures/pump_dirt_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_dirt_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_flame_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_flame_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_flame_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_flame_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_05.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_06.png # tests/performance-tests/Resources/Particle3D/textures/pump_genesis_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_genesis_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_hourglass.png # tests/performance-tests/Resources/Particle3D/textures/pump_leave.png # tests/performance-tests/Resources/Particle3D/textures/pump_lightning_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_lightning_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_lightning_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_lightning_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_mcdxiiiv.png # tests/performance-tests/Resources/Particle3D/textures/pump_metal_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_metal_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_mmviii.png # tests/performance-tests/Resources/Particle3D/textures/pump_pentagram_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_pentagram_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_ring_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_ring_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_ring_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_ring_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_ring_05.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_05.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_06.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_07.png # tests/performance-tests/Resources/Particle3D/textures/pump_snow_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_spark_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_star_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_star_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_star_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_star_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_star_05.png # tests/performance-tests/Resources/Particle3D/textures/pump_streak_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_streak_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_streak_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_streak_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_swirl_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_swirl_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_swirl_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_watch.png # tests/performance-tests/Resources/Particle3D/textures/weaponTrail.png # tests/performance-tests/Resources/TileMaps/iso-test.png # tests/performance-tests/Resources/TileMaps/iso-test2.png # tests/performance-tests/Resources/fonts/bitmapFontTest3.png # tests/performance-tests/Resources/fps_images.png # tests/performance-tests/proj.ios/[email protected] # tests/performance-tests/proj.ios/[email protected] # tests/performance-tests/proj.ios/[email protected] # tests/performance-tests/proj.ios/Default.png # tests/performance-tests/proj.ios/[email protected] # tests/performance-tests/proj.ios/Icon-100.png # tests/performance-tests/proj.ios/Icon-114.png # tests/performance-tests/proj.ios/Icon-120.png # tests/performance-tests/proj.ios/Icon-144.png # tests/performance-tests/proj.ios/Icon-152.png # tests/performance-tests/proj.ios/Icon-29.png # tests/performance-tests/proj.ios/Icon-40.png # tests/performance-tests/proj.ios/Icon-50.png # tests/performance-tests/proj.ios/Icon-57.png # tests/performance-tests/proj.ios/Icon-58.png # tests/performance-tests/proj.ios/Icon-72.png # tests/performance-tests/proj.ios/Icon-76.png # tests/performance-tests/proj.ios/Icon-80.png # tools/cocos2d-console
fleon
reviewed
Dec 11, 2018
huangwei1024
pushed a commit
to huangwei1024/cocos2d-x
that referenced
this pull request
Jun 20, 2019
…t and TouchEnd events. (cocos2d#19191)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue:
If Garbage collection of SpiderMonkey run between TouchStart and TouchEnd event application was crashing.
RCA:
If GC Runs between two touchMove Event. Touch event JSProxy were getting GarbageCollect because they were created as weak object and on next touchMove event application was crashing inside JS-Engine.
I Have added touchEvents to strong object map and have verified that it is getting deleted after TouchEnd/TouchCancel event.