Skip to content

fix imageview possible memory leaks #3446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2017
Merged

fix imageview possible memory leaks #3446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion extensions/ccui/base-classes/UIScale9Sprite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* global ccui */

/****************************************************************************
Copyright (c) 2008-2010 Ricardo Quesada
Copyright (c) 2011-2012 cocos2d-x.org
Expand Down Expand Up @@ -363,6 +365,7 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
_uvsDirty: true,
_isTriangle: false,
_isTrimmedContentSize: false,
_textureLoaded: false,

//v3.3
_flippedX: false,
Expand Down Expand Up @@ -410,6 +413,10 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
}
},

textureLoaded: function () {
return this._textureLoaded;
},

getCapInsets: function () {
return cc.rect(this._capInsetsInternal);
},
Expand Down Expand Up @@ -473,6 +480,7 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
}

var locLoaded = texture.isLoaded();
this._textureLoaded = locLoaded;
this._loader.clear();
if (!locLoaded) {
this._loader.once(texture, function () {
Expand Down Expand Up @@ -604,10 +612,12 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
if (cc.sizeEqualToSize(self._contentSize, cc.size(0, 0))) {
self.setContentSize(self._spriteFrame._rect);
}
self._textureLoaded = true;
self._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.contentDirty);
cc.renderer.childrenOrderDirty = true;
};
if (spriteFrame.textureLoaded()) {
self._textureLoaded = spriteFrame.textureLoaded();
if (self._textureLoaded) {
onResourceDataLoaded();
} else {
this._loader.clear();
Expand Down
32 changes: 18 additions & 14 deletions extensions/ccui/uiwidgets/UIImageView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,6 @@ ccui.ImageView = ccui.Widget.extend(/** @lends ccui.ImageView# */{
this._imageTexType = texType;
var imageRenderer = self._imageRenderer;

if(!imageRenderer._textureLoaded){
imageRenderer.addEventListener("load", function(){
if(!self._ignoreSize && cc.sizeEqualToSize(self._customSize, cc.size(0, 0))) {
self._customSize = self._imageRenderer.getContentSize();
}

self._imageTextureSize = imageRenderer.getContentSize();

self._updateChildrenDisplayedRGBA();

self._updateContentSizeWithTextureSize(self._imageTextureSize);
});
}

switch (self._imageTexType) {
case ccui.Widget.LOCAL_TEXTURE:
if(self._scale9Enabled){
Expand All @@ -120,6 +106,24 @@ ccui.ImageView = ccui.Widget.extend(/** @lends ccui.ImageView# */{
break;
}

if(!imageRenderer._textureLoaded){
var handleTextureLoadedEvent = function(){
imageRenderer.removeEventListener("load", handleTextureLoadedEvent);

if(!self._ignoreSize && cc.sizeEqualToSize(self._customSize, cc.size(0, 0))) {
self._customSize = self._imageRenderer.getContentSize();
}

self._imageTextureSize = imageRenderer.getContentSize();

self._updateChildrenDisplayedRGBA();

self._updateContentSizeWithTextureSize(self._imageTextureSize);
};

imageRenderer.addEventListener("load", handleTextureLoadedEvent);
}

if(!this._ignoreSize && cc.sizeEqualToSize(this._customSize, cc.size(0, 0))) {
this._customSize = this._imageRenderer.getContentSize();
}
Expand Down