Enabled Mosaic view on each volume.

Enabled Mosaic view on each volume.

Since the Image loader extension has been introduced, there is no image size bottle-neck anymore. Therefore, we can generate thumbnails for full-resolution images without affecting the ui. However, generating thumbnails from a full-resolution image takes time, therefore the mosaic mode's been modified, so it is possible to use the mosaic view while loading pictures. There is no need to wait until all the images are loaded.

TEST=Check mosaic view on usb drive in downloads and on google drive.
BUG=176216
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=185227

[mtomasz, 2013-02-26 07:57:45]

@yoshiki: PTAL.

[yoshiki, 2013-02-26 08:21:44]

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/media/media_util.js (right):

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/media/media_util.js:96: * @enum
@enum {number}

The @enum tag must be followed by a type expression.

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/photo/mosaic_mode.js (right):

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/photo/mosaic_mode.js:303: * @param
{function} callback Completion callback.
Please add function parameter.

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/photo/mosaic_mode.js:1706: * @param
{function} onImageLoaded Callback when image is loaded.
Please add a function parameter.

[mtomasz, 2013-02-26 08:39:19]

Thanks for the fast review.

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/media/media_util.js (right):

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/media/media_util.js:96: * @enum
On 2013/02/26 08:21:44, yoshiki wrote:
> @enum {number}
> 
> The @enum tag must be followed by a type expression.

We have to fix it in lots of places. Separate cl? This enum done.

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/photo/mosaic_mode.js (right):

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/photo/mosaic_mode.js:303: * @param
{function} callback Completion callback.
On 2013/02/26 08:21:44, yoshiki wrote:
> Please add function parameter.

This callback has no arguments.

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/photo/mosaic_mode.js:1706: * @param
{function} onImageLoaded Callback when image is loaded.
On 2013/02/26 08:21:44, yoshiki wrote:
> Please add a function parameter.

Done.

[yoshiki, 2013-02-26 08:50:27]

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/media/media_util.js (right):

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/media/media_util.js:96: * @enum
On 2013/02/26 08:39:20, mtomasz wrote:
> On 2013/02/26 08:21:44, yoshiki wrote:
> > @enum {number}
> > 
> > The @enum tag must be followed by a type expression.
> 
> We have to fix it in lots of places. Separate cl? This enum done.

Thanks. We need to fix the others as well in separate cl or when we modify
around there.

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/photo/mosaic_mode.js (right):

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/photo/mosaic_mode.js:303: * @param
{function} callback Completion callback.
On 2013/02/26 08:39:20, mtomasz wrote:
> On 2013/02/26 08:21:44, yoshiki wrote:
> > Please add function parameter.
> 
> This callback has no arguments.

Sorry for not being clear. Please add an empty parameter, like "@param
{function()}".

https://codereview.chromium.org/12316118/diff/6001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/photo/gallery.js (right):

https://codereview.chromium.org/12316118/diff/6001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/photo/gallery.js:163: * @type {number}.
@const

https://codereview.chromium.org/12316118/diff/6001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/photo/mosaic_mode.js (right):

https://codereview.chromium.org/12316118/diff/6001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/photo/mosaic_mode.js:1708: * @param
{function=} opt_onThumbnailError Callback for image loading error.
ditto

[mtomasz, 2013-02-27 00:55:31]

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/media/media_util.js (right):

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/media/media_util.js:96: * @enum
On 2013/02/26 08:50:27, yoshiki wrote:
> On 2013/02/26 08:39:20, mtomasz wrote:
> > On 2013/02/26 08:21:44, yoshiki wrote:
> > > @enum {number}
> > > 
> > > The @enum tag must be followed by a type expression.
> > 
> > We have to fix it in lots of places. Separate cl? This enum done.
> 
> Thanks. We need to fix the others as well in separate cl or when we modify
> around there.

Done.

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/photo/mosaic_mode.js (right):

https://codereview.chromium.org/12316118/diff/2001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/photo/mosaic_mode.js:303: * @param
{function} callback Completion callback.
On 2013/02/26 08:50:27, yoshiki wrote:
> On 2013/02/26 08:39:20, mtomasz wrote:
> > On 2013/02/26 08:21:44, yoshiki wrote:
> > > Please add function parameter.
> > 
> > This callback has no arguments.
> 
> Sorry for not being clear. Please add an empty parameter, like "@param
> {function()}".

Done.

https://codereview.chromium.org/12316118/diff/6001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/photo/gallery.js (right):

https://codereview.chromium.org/12316118/diff/6001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/photo/gallery.js:163: * @type {number}.
On 2013/02/26 08:50:27, yoshiki wrote:
> @const

Done.

https://codereview.chromium.org/12316118/diff/6001/chrome/browser/resources/f...
File chrome/browser/resources/file_manager/js/photo/mosaic_mode.js (right):

https://codereview.chromium.org/12316118/diff/6001/chrome/browser/resources/f...
chrome/browser/resources/file_manager/js/photo/mosaic_mode.js:1708: * @param
{function=} opt_onThumbnailError Callback for image loading error.
On 2013/02/26 08:50:27, yoshiki wrote:
> ditto

Done.

[yoshiki, 2013-02-28 02:33:33]

lgtm

[commit-bot: I haz the power, 2013-02-28 03:59:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mtomasz@chromium.org/12316118/11001

[commit-bot: I haz the power, 2013-02-28 03:59:12]

Failed to apply patch for
chrome/browser/resources/file_manager/js/media/media_util.js:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/resources/file_manager/js/media/media_util.js
  Hunk #1 succeeded at 12 with fuzz 1.
  Hunk #2 succeeded at 41 (offset 1 line).
  Hunk #3 succeeded at 65 (offset 1 line).
  Hunk #4 succeeded at 75 (offset 1 line).
  Hunk #5 succeeded at 84 (offset 1 line).
  Hunk #6 succeeded at 92 (offset 1 line).
  Hunk #7 succeeded at 139 (offset 1 line).
  Hunk #8 FAILED at 167.
  Hunk #9 succeeded at 189 (offset 6 lines).
  Hunk #10 FAILED at 239.
  Hunk #11 succeeded at 302 (offset 11 lines).
  2 out of 11 hunks FAILED -- saving rejects to file
chrome/browser/resources/file_manager/js/media/media_util.js.rej

Patch:       chrome/browser/resources/file_manager/js/media/media_util.js
Index: chrome/browser/resources/file_manager/js/media/media_util.js
diff --git a/chrome/browser/resources/file_manager/js/media/media_util.js
b/chrome/browser/resources/file_manager/js/media/media_util.js
index
2d105007d7baf423fbb954fe5a2aefaedfa77772..30e990f969dc7874735eb156f1abdb3e3964a3f2
100644
--- a/chrome/browser/resources/file_manager/js/media/media_util.js
+++ b/chrome/browser/resources/file_manager/js/media/media_util.js
@@ -12,9 +12,14 @@
  *     default: IMAGE.
  * @param {Object=} opt_metadata Metadata object.
  * @param {string=} opt_mediaType Media type.
+ * @param {ThumbnailLoader.UseEmbedded=} opt_useEmbedded If to use embedded
+ *     jpeg thumbnail if available. Default: USE_EMBEDDED.
  * @constructor
  */
-function ThumbnailLoader(url, opt_loaderType, opt_metadata, opt_mediaType) {
+function ThumbnailLoader(
+    url, opt_loaderType, opt_metadata, opt_mediaType, opt_useEmbedded) {
+  opt_useEmbedded = opt_useEmbedded ||
ThumbnailLoader.UseEmbedded.USE_EMBEDDED;
+
   this.mediaType_ = opt_mediaType || FileType.getMediaType(url);
   this.loaderType_ = opt_loaderType || ThumbnailLoader.LoaderType.IMAGE;
 
@@ -35,7 +40,8 @@ function ThumbnailLoader(url, opt_loaderType, opt_metadata,
opt_mediaType) {
     }
   }
 
-  if (opt_metadata.thumbnail && opt_metadata.thumbnail.url) {
+  if (opt_metadata.thumbnail && opt_metadata.thumbnail.url &&
+      opt_useEmbedded == ThumbnailLoader.UseEmbedded.USE_EMBEDDED) {
     this.thumbnailUrl_ = opt_metadata.thumbnail.url;
     this.transform_ = opt_metadata.thumbnail.transform;
   } else if (FileType.isImage(url)) {
@@ -58,7 +64,7 @@ ThumbnailLoader.AUTO_FILL_THRESHOLD = 0.3;
 
 /**
  * Type of displaying a thumbnail within a box.
- * @enum
+ * @enum {number}
  */
 ThumbnailLoader.FillMode = {
   FILL: 0,  // Fill whole box. Image may be cropped.
@@ -68,7 +74,7 @@ ThumbnailLoader.FillMode = {
 
 /**
  * Optimization mode for downloading thumbnails.
- * @enum
+ * @enum {number}
  */
 ThumbnailLoader.OptimizationMode = {
   NEVER_DISCARD: 0,    // Never discards downloading. No optimization.
@@ -77,7 +83,7 @@ ThumbnailLoader.OptimizationMode = {
 
 /**
  * Type of element to store the image.
- * @enum
+ * @enum {number}
  */
 ThumbnailLoader.LoaderType = {
   IMAGE: 0,
@@ -85,6 +91,16 @@ ThumbnailLoader.LoaderType = {
 };
 
 /**
+ * Whether to use the embedded thumbnail, or not. The embedded thumbnail may
+ * be small.
+ * @enum {number}
+ */
+ThumbnailLoader.UseEmbedded = {
+  USE_EMBEDDED: 0,
+  NO_EMBEDDED: 1
+};
+
+/**
  * Maximum thumbnail's width when generating from the full resolution image.
  * @const
  * @type {number}
@@ -122,6 +138,7 @@ ThumbnailLoader.prototype.load = function(box, fillMode,
opt_optimizationMode,
     return;
   }
 
+  this.cancel();
   this.canvasUpToDate_ = false;
   this.image_ = new Image();
   this.image_.onload = function() {
@@ -150,7 +167,7 @@ ThumbnailLoader.prototype.load = function(box, fillMode,
opt_optimizationMode,
 
   // TODO(mtomasz): Smarter calculation of the requested size.
   var wasAttached = box.ownerDocument.contains(box);
-  var taskId = util.loadImage(
+  this.taskId_ = util.loadImage(
       this.image_,
       this.thumbnailUrl_,
       { maxWidth: ThumbnailLoader.THUMBNAIL_MAX_WIDTH,
@@ -166,11 +183,22 @@ ThumbnailLoader.prototype.load = function(box, fillMode,
opt_optimizationMode,
         return true;
       });
 
-  if (!taskId)
+  if (!this.taskId_)
     this.image_.classList.add('cached');
 };
 
 /**
+ * Cancels loading the current image.
+ */
+ThumbnailLoader.prototype.cancel = function() {
+  if (this.taskId_) {
+    this.image_.onload = function() {};
+    this.image_.onerror = function() {};
+    util.cancelLoadImage(this.taskId_);
+  }
+};
+
+/**
  * @return {boolean} True if a valid image is loaded.
  */
 ThumbnailLoader.prototype.hasValidImage = function() {
@@ -211,20 +239,21 @@ ThumbnailLoader.prototype.loadDetachedImage =
function(callback) {
     return;
   }
 
+  this.cancel();
   this.canvasUpToDate_ = false;
   this.image_ = new Image();
   this.image_.onload = callback.bind(null, true);
   this.image_.onerror = callback.bind(null, false);
 
   // TODO(mtomasz): Smarter calculation of the requested size.
-  var taskId = util.loadImage(
+  this.taskId_ = util.loadImage(
       this.image_,
       this.thumbnailUrl_,
       { maxWidth: ThumbnailLoader.THUMBNAIL_MAX_WIDTH,
         maxHeight: ThumbnailLoader.THUMBNAIL_MAX_HEIGHT,
         cache: true });
 
-  if (!taskId)
+  if (!this.taskId_)
     this.image_.classList.add('cached');
 };
 
@@ -263,7 +292,7 @@ ThumbnailLoader.prototype.attachImage = function(container,
fillMode) {
   util.applyTransform(container, this.transform_);
   ThumbnailLoader.centerImage_(
       container, attachableMedia, fillMode, this.isRotated_());
-  if (this.image_.parentNode != container) {
+  if (attachableMedia.parentNode != container) {
     container.textContent = '';
     container.appendChild(attachableMedia);
   }

[commit-bot: I haz the power, 2013-02-28 08:05:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mtomasz@chromium.org/12316118/14002

[commit-bot: I haz the power, 2013-02-28 11:34:48]

Change committed as 185227