Gallery.app: Update thumbnail when a file is edited on the photo editor.

This CL do followings to ensure to update thumbnails after the app saves images.

* Add '?nocache=xxx' to FileEntry's URL to ignore browser caches.
* Stop to use drive thumbnails for files that are on the drive but cached
  locally. These files may be edited locally and be out of sync with the local
  cache.
* Specify the current time as modificationTime of the metadata that is
  dispatched when the edited file is saved.

BUG=378648
TEST=manually

Review URL: https://codereview.chromium.org/310433004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274506 0039d316-1c4b-4281-b951-d872f2087c98

ui/file_manager/file_manager/foreground/js/media/media_util.js

@@ -49,6 +49,13 @@ function ThumbnailLoader(entry, opt_loaderType, opt_metadata, opt_mediaType,
     };
   }
 
+  // If the file is on the drive and it is present, the file may be out of sync
+  // drive's thumbnail. So we don't use it.
+  if (opt_metadata.drive && opt_metadata.drive.present) {
+    opt_metadata = MetadataCache.cloneMetadata(opt_metadata);
+    opt_metadata.thumbnail = null;
+  }
+
   if (opt_metadata.thumbnail && opt_metadata.thumbnail.url &&
       opt_useEmbedded === ThumbnailLoader.UseEmbedded.USE_EMBEDDED) {
     this.thumbnailUrl_ = opt_metadata.thumbnail.url;

ui/file_manager/gallery/js/image_editor/image_util.js

@@ -489,14 +489,9 @@ ImageUtil.ImageLoader.prototype.load = function(
     // general error should not be specified
     this.image_.onerror = onError.bind(this, 'GALLERY_IMAGE_ERROR');
 
-    // Extract the last modification date to determine if the cached image
-    // is outdated.
-    var modificationTime = opt_metadata &&
-                           opt_metadata.modificationTime &&
-                           opt_metadata.modificationTime.getTime();
-
-    // Load the image directly.
-    this.image_.src = entry.toURL();
+    // 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);
 
   // Loads the image. If already loaded, then forces a reload.

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

@@ -403,13 +403,24 @@ ImageView.prototype.load = function(entry, metadata, effect,
 
   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.drive.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.drive && !metadata.drive.present) {
+        width = metadata.drive.imageWidth;
+        height = metadata.drive.imageHeight;
+      }
       self.replace(
           canvas,
           effect,
-          (metadata.media && metadata.media.width) ||
-              metadata.drive.imageWidth,
-          (metadata.media && metadata.media.height) ||
-              metadata.drive.imageHeight,
+          width,
+          height,
           true /* preview */);
       if (displayCallback) displayCallback();
     }

ui/file_manager/gallery/js/ribbon.js

@@ -344,7 +344,13 @@ Ribbon.prototype.setThumbnailImage_ = function(thumbnail, entry, metadata) {
  */
 Ribbon.prototype.onContentChange_ = function(event) {
   var url = event.item.getEntry().toURL();
-  this.remapCache_(event.oldEntry.toURL(), url);
+  if (event.oldEntry.toURL() !== url) {
+    this.remapCache_(event.oldEntry.toURL(), url);
+  } else {
+    delete this.renderCache_[url];
+    var index = this.dataModel_.indexOf(event.item);
+    this.renderThumbnail_(index);
+  }
 
   var thumbnail = this.renderCache_[url];
   if (thumbnail && event.metadata)

ui/file_manager/gallery/js/slide_mode.js

@@ -940,6 +940,8 @@ SlideMode.prototype.saveCurrentImage_ = function(callback) {
       this.selectedImageMetadata_.media, canvas, 1 /* quality */);
   var selectedImageMetadata = ContentProvider.ConvertContentMetadata(
       metadataEncoder.getMetadata(), this.selectedImageMetadata_);
+  if (selectedImageMetadata.filesystem)
+    selectedImageMetadata.filesystem.modificationTime = new Date();
   this.selectedImageMetadata_ = selectedImageMetadata;
   this.metadataCache_.set(oldEntry,
                           Gallery.METADATA_TYPE,

ui/file_manager/image_loader/request.js

@@ -273,8 +273,15 @@ AuthorizedXHR.prototype.load = function(url, onSuccess, onFailure) {
   }.bind(this);
 
   // Do not request a token for local resources, since it is not necessary.
-  if (url.indexOf('filesystem:') === 0) {
-    this.xhr_ = AuthorizedXHR.load_(null, url, onMaybeSuccess, onMaybeFailure);
+  if (/^filesystem:/.test(url)) {
+    // The query parameter is workaround for
+    // crbug.com/379678, which force to obtain the latest contents of the image.
+    var noCacheUrl = url + '?nocache=' + Date.now();
+    this.xhr_ = AuthorizedXHR.load_(
+        null,
+        noCacheUrl,
+        onMaybeSuccess,
+        onMaybeFailure);
     return;
   }