From 9261e2a1287b30649a0f56b8f1497080ecb89f8c Mon Sep 17 00:00:00 2001 From: "mtomasz@chromium.org" Date: Thu, 27 Jun 2013 09:29:31 +0000 Subject: Use server side generated thumbnails for Drive images. This patch switches for generating images from full resolution images to server side generated thumbnails for images on Drive, what significantly improves loading times. TEST=Tested manually. Thumbnails should load faster. Browser tests should still pass. BUG=254784 R=yoshiki@chromium.org Review URL: https://codereview.chromium.org/18007002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208876 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/resources/file_manager/css/file_manager.css | 2 +- chrome/browser/resources/file_manager/js/file_grid.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/chrome/browser/resources/file_manager/css/file_manager.css b/chrome/browser/resources/file_manager/css/file_manager.css index 201e8c7..21ba6ce 100644 --- a/chrome/browser/resources/file_manager/css/file_manager.css +++ b/chrome/browser/resources/file_manager/css/file_manager.css @@ -902,7 +902,7 @@ body[type='full-page'] .detail-name .detail-icon { } .img-container > img:not(.cached):not(.drag-thumbnail) { - -webkit-animation: fadeIn 500ms ease-in; + -webkit-animation: fadeIn 250ms linear; } .thumbnail-bottom { diff --git a/chrome/browser/resources/file_manager/js/file_grid.js b/chrome/browser/resources/file_manager/js/file_grid.js index afe0c50..281c466 100644 --- a/chrome/browser/resources/file_manager/js/file_grid.js +++ b/chrome/browser/resources/file_manager/js/file_grid.js @@ -144,8 +144,10 @@ FileGrid.decorateThumbnailBox = function( new ThumbnailLoader(imageUrl, ThumbnailLoader.LoaderType.IMAGE, metadata, - undefined, - ThumbnailLoader.UseEmbedded.NO_EMBEDDED). + undefined, // opt_mediaType + FileType.isOnDrive(imageUrl) ? + ThumbnailLoader.UseEmbedded.USE_EMBEDDED : + ThumbnailLoader.UseEmbedded.NO_EMBEDDED). load(box, fillMode, ThumbnailLoader.OptimizationMode.DISCARD_DETACHED, -- cgit v1.1