Merge pull request #3446 from zilongshanren/fix-imageview-memory-leaks

fix imageview possible memory leaks

Author: pandamicro

extensions/ccui/base-classes/UIScale9Sprite.js

@@ -1,3 +1,5 @@
+/* global ccui */
+
 /****************************************************************************
  Copyright (c) 2008-2010 Ricardo Quesada
  Copyright (c) 2011-2012 cocos2d-x.org
@@ -367,6 +369,7 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
     _uvsDirty: true,
     _isTriangle: false,
     _isTrimmedContentSize: false,
+    _textureLoaded: false,
 
     //v3.3
     _flippedX: false,
@@ -414,6 +417,10 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
         }
     },
 
+    textureLoaded: function () {
+        return this._textureLoaded;
+    },
+
     getCapInsets: function () {
         return cc.rect(this._capInsetsInternal);
     },
@@ -477,6 +484,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 () {
@@ -608,10 +616,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();

extensions/ccui/uiwidgets/UIImageView.js

@@ -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){
@@ -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();
         }