Gallery: Start to use new metadata model in Gallery.

ui/file_manager/gallery/js/image_editor/image_util.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.
 
 // Namespace object for the utilities.
 var ImageUtil = {};
 
 /**
  * Performance trace.
  */
@@ skipping 409 matching lines @@
 };
 
 /**
  * ImageLoader loads an image from a given Entry into a canvas in two steps:
  * 1. Loads the image into an HTMLImageElement.
  * 2. Copies pixels from HTMLImageElement to HTMLCanvasElement. This is done
  *    stripe-by-stripe to avoid freezing up the UI. The transform is taken into
  *    account.
  *
  * @param {!HTMLDocument} document Owner document.
+ * @param {!MetadataModel} metadataModel
  * @constructor
  * @struct
  */
-ImageUtil.ImageLoader = function(document) {
+ImageUtil.ImageLoader = function(document, metadataModel) {
   this.document_ = document;
+
+  /**
+   * @private {!MetadataModel}
+   * @const
+   */
+  this.metadataModel_ = metadataModel;
+
   this.image_ = new Image();
   this.generation_ = 0;
 
   /**
    * @type {number}
    * @private
    */
   this.timeout_ = 0;
 
   /**
@@ skipping 58 matching lines @@
   };
   onError = onError.bind(this);
 
   var loadImage = function() {
     ImageUtil.metrics.startInterval(ImageUtil.getMetricName('LoadTime'));
     this.timeout_ = null;
 
     this.image_.onload = function() {
       this.image_.onerror = null;
       this.image_.onload = null;
-      item.getFetchedMedia().then(function(fetchedMediaMetadata) {
-        if (fetchedMediaMetadata.imageTransform)
-          onTransform(this.image_, fetchedMediaMetadata.imageTransform);
-        else
-          onTransform(this.image_);
-      }.bind(this)).catch(function(error) {
-        console.error(error.stack || error);
-      });
+      this.metadataModel_.get([entry], ['contentThumbnailTransform']).then(

[yawano, 2015/03/03 04:14:50]

Isn't this contentImageTransform instead of contentThumbnailTransform?

[hirono, 2015/03/04 05:07:04]

Good catch. Done.

+          function(metadataItems) {
+            onTransform(
+                this.image_, metadataItems[0].contentThumbnailTransform);
+          }.bind(this));
     }.bind(this);
 
     // The error callback has an optional error argument, which in case of a
     // general error should not be specified
     this.image_.onerror = onError.bind(this, 'GALLERY_IMAGE_ERROR');
 
     // Load the image directly. The query parameter is workaround for
     // crbug.com/379678, which force to update the contents of the image.
     this.image_.src = entry.toURL() + '?nocache=' + Date.now();
   }.bind(this);
@@ skipping 190 matching lines @@
 ImageUtil.getMetricName = function(name) {
   return 'PhotoEditor.' + name;
 };
 
 /**
  * Used for metrics reporting, keep in sync with the histogram description.
  * @type {Array.<string>}
  * @const
  */
 ImageUtil.FILE_TYPES = ['jpg', 'png', 'gif', 'bmp', 'webp'];