Fix infinite loading for small images in Files.app.

chrome/browser/resources/file_manager/js/image_editor/image_util.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 
 // Namespace object for the utilities.
 function ImageUtil() {}
 
@@ skipping 464 matching lines @@
       transformFetcher(url, onTransform.bind(this, e.target));
     }.bind(this);
     // errorCallback has an optional error argument, which in case of general
     // error should not be specified
     this.image_.onerror = onError.bind(this, 'IMAGE_ERROR');
     this.taskId_ = util.loadImage(this.image_, url, {priority: 1});
   }.bind(this);
 
   // The clients of this class sometimes request the same url repeatedly.
   // The onload fires only if the src is different from the previous value.
-  // To work around that we reset the src temporarily to an 1x1 pixel.
-  // Load an empty 1x1 pixel image first.
+  // To work around that we reset the src temporarily to an 1x1 pixel to force
+  // garbage collecting, and then resetting src to an empty value.
   var resetImage = function(callback) {
-    this.image_.onload = callback;
-    this.image_.onerror = onError.bind(this, 'IMAGE_ERROR');
-    this.image_.src = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAA' +
+    var clearSrc = function() {
+      this.image_.onload = callback;
+      this.image_.onerror = callback;
+      this.image_.src = '';
+    }.bind(this);
+    var emptyImage = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAA' +
         'AAABAAEAAAICTAEAOw==';
+    if (this.image_.src != emptyImage) {
+      // Load an empty image, then clear src.
+      this.image_.onload = clearSrc;
+      this.image_.onerror = onError.bind(this, 'IMAGE_ERROR');
+      this.image_.src = emptyImage;
+    } else {
+      // Empty image already loaded, so clear src immediately.
+      clearSrc();
+    }
   }.bind(this);
 
-  // Loads the image. If already loaded, then forces reloads.
+  // Loads the image. If already loaded, then forces a reload.
   var startLoad = function() {

[yoshiki, 2013/06/11 06:45:39]

nit:
var startLoad = resetImage.bind(null, loadImage);

[mtomasz, 2013/06/11 08:14:13]

Done.

-    if (this.image_.src == url)
-      resetImage(loadImage);
-    else
-      loadImage();
+    resetImage(loadImage);
   }.bind(this);
 
   if (opt_delay) {
     this.timeout_ = setTimeout(startLoad, opt_delay);
   } else {
     startLoad();
   }
 };
 
 /**
@@ skipping 179 matching lines @@
  * @return {string} Full name.
  */
 ImageUtil.getMetricName = function(name) {
   return 'PhotoEditor.' + name;
 };
 
 /**
  * Used for metrics reporting, keep in sync with the histogram description.
  */
 ImageUtil.FILE_TYPES = ['jpg', 'png', 'gif', 'bmp', 'webp'];