From 61dcd9d68a602e10ba05fdf33a8d6dd90eecf2a7 Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 12 Aug 2016 18:01:49 +0800 Subject: [PATCH] working on fixing memleak in JSB --- CCDebugger.js | 8 ++++- cocos2d/core/components/CCMask.js | 20 ++++++++----- cocos2d/core/components/CCRendererInSG.js | 1 + cocos2d/core/components/CCRendererUnderSG.js | 1 + cocos2d/core/components/CCSGComponent.js | 1 + cocos2d/core/components/CCSprite.js | 29 ++++++++++++------- .../core/load-pipeline/auto-release-utils.js | 10 ++++++- cocos2d/core/load-pipeline/uuid-loader.js | 3 +- cocos2d/core/platform/CCClass.js | 9 ++++++ 9 files changed, 61 insertions(+), 21 deletions(-) diff --git a/CCDebugger.js b/CCDebugger.js index 52ea74b18d..73f672db61 100644 --- a/CCDebugger.js +++ b/CCDebugger.js @@ -543,7 +543,13 @@ cc._initDebugSetting = function (mode) { } } cc._throw = CC_EDITOR ? Editor.error : function (error) { - cc.error(error.stack || error); + var stack = error.stack; + if (stack) { + cc.error(CC_JSB ? (error + '\n' + stack) : stack); + } + else { + cc.error(error); + } }; }; //+++++++++++++++++++++++++something about log end+++++++++++++++++++++++++++++ diff --git a/cocos2d/core/components/CCMask.js b/cocos2d/core/components/CCMask.js index 3d6f28b019..bc5aaf1cc5 100644 --- a/cocos2d/core/components/CCMask.js +++ b/cocos2d/core/components/CCMask.js @@ -23,6 +23,8 @@ THE SOFTWARE. ****************************************************************************/ +var Base = cc._RendererInSG; + /** * @class Mask * @extends _RendererInSG @@ -51,7 +53,7 @@ var MaskType = cc.Enum({ var Mask = cc.Class({ name: 'cc.Mask', - extends: cc._RendererInSG, + extends: Base, editor: CC_EDITOR && { menu: 'i18n:MAIN_MENU.component.renderers/Mask', @@ -167,12 +169,6 @@ var Mask = cc.Class({ this.node.off('anchor-changed', this._refreshStencil, this); }, - onDestroy: CC_JSB && function () { - this._super(); - this._clippingStencil.release(); - this._clippingStencil = null; - }, - _calculateCircle: function(center, radius, segements) { var polies =[]; var anglePerStep = Math.PI * 2 / segements; @@ -208,4 +204,14 @@ var Mask = cc.Class({ } }); +if (CC_JSB) { + // override onDestroy + Mask.prototype.__superOnDestroy = Base.prototype.onDestroy; + Mask.prototype.onDestroy = function () { + this.__superOnDestroy(); + this._clippingStencil.release(); + this._clippingStencil = null; + }; +} + cc.Mask = module.exports = Mask; diff --git a/cocos2d/core/components/CCRendererInSG.js b/cocos2d/core/components/CCRendererInSG.js index c349c8f6ab..57476afe85 100644 --- a/cocos2d/core/components/CCRendererInSG.js +++ b/cocos2d/core/components/CCRendererInSG.js @@ -33,6 +33,7 @@ */ var RendererInSG = cc.Class({ extends: require('./CCSGComponent'), + name: 'cc._RendererInSG', ctor: function () { /** diff --git a/cocos2d/core/components/CCRendererUnderSG.js b/cocos2d/core/components/CCRendererUnderSG.js index 12c424d248..fbbee4c901 100644 --- a/cocos2d/core/components/CCRendererUnderSG.js +++ b/cocos2d/core/components/CCRendererUnderSG.js @@ -32,6 +32,7 @@ */ var RendererUnderSG = cc.Class({ extends: require('./CCSGComponent'), + name: 'cc._RendererUnderSG', ctor: function () { /** diff --git a/cocos2d/core/components/CCSGComponent.js b/cocos2d/core/components/CCSGComponent.js index 0499d695de..01ca05a92c 100644 --- a/cocos2d/core/components/CCSGComponent.js +++ b/cocos2d/core/components/CCSGComponent.js @@ -38,6 +38,7 @@ var SceneGraphHelper = require('../utils/scene-graph-helper'); */ var SGComponent = cc.Class({ extends: require('./CCComponent'), + name: 'cc._SGComponent', editor: CC_EDITOR && { executeInEditMode: true, diff --git a/cocos2d/core/components/CCSprite.js b/cocos2d/core/components/CCSprite.js index 28d7c9616e..055b2fffbe 100644 --- a/cocos2d/core/components/CCSprite.js +++ b/cocos2d/core/components/CCSprite.js @@ -23,6 +23,8 @@ THE SOFTWARE. ****************************************************************************/ +var Base = require('./CCRendererUnderSG'); + /** * !#en Enum for sprite type. * !#zh Sprite 类型 @@ -113,7 +115,7 @@ var SizeMode = cc.Enum({ */ var Sprite = cc.Class({ name: 'cc.Sprite', - extends: require('./CCRendererUnderSG'), + extends: Base, editor: CC_EDITOR && { menu: 'i18n:MAIN_MENU.component.renderers/Sprite', @@ -483,11 +485,6 @@ var Sprite = cc.Class({ return this._sgNode.getInsetBottom(); }, - __preload: CC_EDITOR && function () { - this._super(); - this.node.on('size-changed', this._resized, this); - }, - onEnable: function () { if (this._sgNode) { if (this._spriteFrame && this._spriteFrame.textureLoaded()) { @@ -496,11 +493,6 @@ var Sprite = cc.Class({ } }, - onDestroy: CC_EDITOR && function () { - this._super(); - this.node.off('size-changed', this._resized, this); - }, - _applyAtlas: CC_EDITOR && function (spriteFrame) { // Set atlas if (spriteFrame && spriteFrame._atlasUuid) { @@ -623,6 +615,21 @@ var Sprite = cc.Class({ }, }); +if (CC_EDITOR) { + // override __preload + Sprite.prototype.__superPreload = Base.prototype.__preload; + Sprite.prototype.__preload = function () { + this.__superPreload(); + this.node.on('size-changed', this._resized, this); + }; + // override onDestroy + Sprite.prototype.__superOnDestroy = Base.prototype.onDestroy; + Sprite.prototype.onDestroy = function () { + this.__superOnDestroy(); + this.node.off('size-changed', this._resized, this); + }; +} + var misc = require('../utils/misc'); var SameNameGetSets = ['atlas', 'capInsets', 'insetLeft', 'insetTop', 'insetRight', 'insetBottom']; var DiffNameGetSets = { diff --git a/cocos2d/core/load-pipeline/auto-release-utils.js b/cocos2d/core/load-pipeline/auto-release-utils.js index 43a947c3a0..60af8f90f7 100644 --- a/cocos2d/core/load-pipeline/auto-release-utils.js +++ b/cocos2d/core/load-pipeline/auto-release-utils.js @@ -22,9 +22,17 @@ function release (loader, key, nextSceneAssets) { loader.removeItem(key); console.log('auto release: ' + key); // TODO: Audio - if (item.content instanceof cc.Texture2D) { + var asset = item.content; + if (asset instanceof cc.Texture2D) { cc.textureCache.removeTextureForKey(item.url); } + //else if (asset instanceof cc.SpriteFrame) { + // // for the "Temporary solution" in deserialize.js + // console.log('release sprite frame: ' + key); + // if (CC_JSB) { + // asset.release(); + // } + //} } } } diff --git a/cocos2d/core/load-pipeline/uuid-loader.js b/cocos2d/core/load-pipeline/uuid-loader.js index d113d6538a..ebc3db3669 100644 --- a/cocos2d/core/load-pipeline/uuid-loader.js +++ b/cocos2d/core/load-pipeline/uuid-loader.js @@ -215,7 +215,8 @@ function loadUuid (item, callback) { }); } catch (e) { - callback( new Error('Uuid Loader: Deserialize asset [' + item.id + '] failed : ' + e.stack) ); + var err = CC_JSB ? (e + '\n' + e.stack) : e.stack; + callback( new Error('Uuid Loader: Deserialize asset [' + item.id + '] failed : ' + err) ); return; } diff --git a/cocos2d/core/platform/CCClass.js b/cocos2d/core/platform/CCClass.js index 953be36160..cfc522cc92 100644 --- a/cocos2d/core/platform/CCClass.js +++ b/cocos2d/core/platform/CCClass.js @@ -906,6 +906,15 @@ function CCClass (options) { }); } else if (CC_DEV) { + if (func === false && base && base.prototype) { + // check override + var overrided = base.prototype[funcName]; + if (typeof overrided === 'function') { + var baseFuc = JS.getClassName(base) + '.' + funcName; + var subFuc = name + '.' + funcName; + cc.warn('"%s" overrided "%s" but "%s" is defined as "false" so the super method will not be called. You can set "%s" to null to disable this warning.', subFuc, baseFuc, subFuc, subFuc); + } + } var correct = TYPO_TO_CORRECT[funcName]; if (correct) { cc.warn('Unknown type of %s.%s, maybe you want is "%s".', name, funcName, correct);