Make the max size for ImageTrackingLoader configurable. This makes it so that icons larger than 16px can be used in browser actions.

This is not that useful until we fix the inset issue in the browser action buttons though, so I will not be checking it in.

Review URL: http://codereview.chromium.org/271029

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

1 files changed, 27 insertions, 13 deletions

diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc
index e141391..211a07b4 100644
--- a/chrome/browser/extensions/image_loading_tracker.cc
+++ b/chrome/browser/extensions/image_loading_tracker.cc
@@ -29,13 +29,19 @@ class ImageLoadingTracker::LoadImageTask : public Task {
   // we use to communicate back to the entity that wants the image after we
   // decode it. |path| is the path to load the image from. |index| is an
   // identifier for the image that we pass back to the caller.
+  // |max_size| is the maximum size for the loaded image. If the image is
+  // larger, it will be resized to fit. It is optional.
   LoadImageTask(ImageLoadingTracker* tracker,
                 const ExtensionResource& resource,
-                size_t index)
+                size_t index,
+                gfx::Size* max_size)
     : callback_loop_(MessageLoop::current()),
       tracker_(tracker),
       resource_(resource),
-      index_(index) {}
+      index_(index){
+    if (max_size)
+      max_size_.reset(new gfx::Size(*max_size));
+  }
 
   void ReportBack(SkBitmap* image) {
     DCHECK(image);
@@ -65,15 +71,18 @@ class ImageLoadingTracker::LoadImageTask : public Task {
       return;  // Unable to decode.
     }
 
-    if (decoded->width() != kFavIconSize || decoded->height() != kFavIconSize) {
-      // The bitmap is not the correct size, re-sample.
-      int new_width = decoded->width();
-      int new_height = decoded->height();
-      // Calculate what dimensions to use within the constraints (16x16 max).
-      calc_favicon_target_size(&new_width, &new_height);
-      *decoded = skia::ImageOperations::Resize(
-          *decoded, skia::ImageOperations::RESIZE_LANCZOS3,
-          new_width, new_height);
+    if (max_size_.get()) {
+      if (decoded->width() > max_size_->width() ||
+          decoded->height() > max_size_->height()) {
+        // The bitmap is not the correct size, re-sample.
+        int new_width = decoded->width();
+        int new_height = decoded->height();
+        // Calculate what dimensions to use within the constraints (16x16 max).
+        calc_favicon_target_size(&new_width, &new_height);
+        *decoded = skia::ImageOperations::Resize(
+            *decoded, skia::ImageOperations::RESIZE_LANCZOS3,
+            new_width, new_height);
+      }
     }
 
     ReportBack(decoded.release());
@@ -91,15 +100,20 @@ class ImageLoadingTracker::LoadImageTask : public Task {
 
   // The index of the icon being loaded.
   size_t index_;
+
+  // The max size for the image. If the image is larger than this, it will be
+  // scaled down.
+  scoped_ptr<gfx::Size> max_size_;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageLoadingTracker
 
-void ImageLoadingTracker::PostLoadImageTask(const ExtensionResource& resource) {
+void ImageLoadingTracker::PostLoadImageTask(const ExtensionResource& resource,
+                                            gfx::Size* max_size) {
   MessageLoop* file_loop = g_browser_process->file_thread()->message_loop();
   file_loop->PostTask(FROM_HERE, new LoadImageTask(this, resource,
-                                                   posted_count_++));
+                                                   posted_count_++, max_size));
 }
 
 void ImageLoadingTracker::OnImageLoaded(SkBitmap* image, size_t index) {