Fixed cache eviction in Files.app's slide mode.

chrome/browser/resources/file_manager/js/image_editor/image_view.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';
 
 /**
  * The overlay displaying the image.
  *
  * @param {HTMLElement} container The container element.
@@ skipping 334 matching lines @@
 
     video.addEventListener('loadedmetadata', onVideoLoadSuccess);
     video.addEventListener('error', onVideoLoadError);
 
     // Do not try no stream when offline.
     video.src = (navigator.onLine && metadata.streaming &&
                  metadata.streaming.url) || url;
     video.load();
     return;
   }
+
+  // Cache has to be evicted in advance, so the returned cached image is not
+  // evicted later by the prefetched image.
+  this.contentCache_.evictLRU();
+
   var cached = this.contentCache_.getItem(this.contentID_);
   if (cached) {
     displayMainImage(ImageView.LOAD_TYPE_CACHED_FULL,
         false /* no preview */, cached);
   } else {
     var cachedScreen = this.screenCache_.getItem(this.contentID_);
     if (cachedScreen) {
       // We have a cached screen-scale canvas, use it instead of a thumbnail.
       displayThumbnail(ImageView.LOAD_TYPE_CACHED_SCREEN, cachedScreen);
       // As far as the user can tell the image is loaded. We still need to load
@@ skipping 432 matching lines @@
  * @param {string} id The item ID.
  * @param {Object} item The item object.
  * @param {boolean=} opt_keepLRU True if the LRU order should not be modified.
  */
 ImageView.Cache.prototype.putItem = function(id, item, opt_keepLRU) {
   var pos = this.order_.indexOf(id);
 
   if ((pos >= 0) != (id in this.map_))
     throw new Error('Inconsistent cache state');
 
-  if ((pos >= 0) && (item != this.map_[id]))
-    this.deleteItem_(this.map_[id]);
-
   if (id in this.map_) {
     if (!opt_keepLRU) {
       // Move to the end (most recently used).
       this.order_.splice(pos, 1);
       this.order_.push(id);
     }
   } else {
     this.evictLRU();
     this.order_.push(id);
   }
 
+  if ((pos >= 0) && (item != this.map_[id]))
+    this.deleteItem_(this.map_[id]);
   this.map_[id] = item;
 
   if (this.order_.length > this.capacity_)
     throw new Error('Exceeded cache capacity');
 };
 
 /**
  * Evict the least recently used items.
  */
 ImageView.Cache.prototype.evictLRU = function() {
@@ skipping 221 matching lines @@
 
 /**
  * @param {HTMLCanvasElement|HTMLVideoElement} element Element.
  * @return {string} Transform string.
  */
 ImageView.Effect.Rotate.prototype.transform = function(element) {
   var ratio = ImageView.Effect.getPixelRatio_(element);
   return 'rotate(' + (this.rotate90_ * 90) + 'deg) ' +
          'scale(' + (this.scale_ / ratio) + ')';
 };