Gallery: Start to use new metadata model in Gallery.

ui/file_manager/gallery/js/image_editor/image_view.js

 // Copyright 2014 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.
 
 /**
  * The overlay displaying the image.
  *
  * @param {!HTMLElement} container The container element.
  * @param {!Viewport} viewport The viewport.
+ * @param {!MetadataModel} metadataModel
  * @constructor
  * @extends {ImageBuffer.Overlay}
  * @struct
  */
-function ImageView(container, viewport) {
+function ImageView(container, viewport, metadataModel) {
   ImageBuffer.Overlay.call(this);
 
   this.container_ = container;
 
   /**
    * The viewport.
    * @type {!Viewport}
    * @private
    */
   this.viewport_ = viewport;
 
   this.document_ = assertInstanceof(container.ownerDocument, HTMLDocument);
   this.contentGeneration_ = 0;
   this.displayedContentGeneration_ = 0;
 
-  this.imageLoader_ = new ImageUtil.ImageLoader(this.document_);
+  this.imageLoader_ =
+      new ImageUtil.ImageLoader(this.document_, metadataModel);
   // We have a separate image loader for prefetch which does not get cancelled
   // when the selection changes.
-  this.prefetchLoader_ = new ImageUtil.ImageLoader(this.document_);
+  this.prefetchLoader_ =
+      new ImageUtil.ImageLoader(this.document_, metadataModel);
 
   this.contentCallbacks_ = [];
 
   /**
    * The element displaying the current content.
    * @type {HTMLCanvasElement}
    * @private
    */
   this.screenImage_ = null;
 
@@ skipping 361 matching lines @@
     default:
       assertNotReached();
   }
 
   /**
    * @param {!ImageView.LoadType} loadType A load type.
    * @param {(HTMLCanvasElement|HTMLImageElement)} canvas A canvas.
    */
   function displayThumbnail(loadType, canvas) {
     if (canvas) {
-      var width = null;
-      var height = null;
-      if (metadata.media) {
-        width = metadata.media.width;
-        height = metadata.media.height;
-      }
-      // If metadata.external.present is true, the image data is loaded directly
-      // from local cache, whose size may be out of sync with the drive
-      // metadata.
-      if (metadata.external && !metadata.external.present) {
-        width = metadata.external.imageWidth;
-        height = metadata.external.imageHeight;
-      }
+      var width = item.getMetadataItem().imageWidth;
+      var height = item.getMetadataItem().imageHeight;
       self.replace(
           canvas,
           effect,
           width,
           height,
           true /* preview */);
-      if (displayCallback) displayCallback();
+      if (displayCallback)
+        displayCallback();
     }
     loadMainImage(loadType, entry, !!canvas,
         (effect && canvas) ? effect.getSafeInterval() : 0);
   }
 
   /**
    * @param {!ImageView.LoadType} loadType Load type.
    * @param {Entry} contentEntry A content entry.
    * @param {boolean} previewShown A preview is shown or not.
    * @param {number} delay Load delay.
@@ skipping 529 matching lines @@
 };
 
 ImageView.Effect.Rotate.prototype = { __proto__: ImageView.Effect.prototype };
 
 /**
  * @override
  */
 ImageView.Effect.Rotate.prototype.transform = function(element, viewport) {
   return viewport.getInverseTransformForRotatedImage(this.orientation_);
 };