Fix some problems with scaled icons. This allows the TabIconView to automatically scale the throbber and favicon to whatever size the View itself is. Notably, this does NOT change tab_renderer.cc, which _also_ draws favicons -- the former is used by app windows and the latter by standard tabs. Argh! I'm not going to bother unifying these for now even though it'd be nice, since we never scale up our tabs, just our app titlebars.

BUG=5054
Review URL: http://codereview.chromium.org/18392

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

3 files changed, 42 insertions, 12 deletions

diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc
index b9af037..8f624ac 100644
--- a/chrome/browser/views/tab_icon_view.cc
+++ b/chrome/browser/views/tab_icon_view.cc
@@ -85,23 +85,44 @@ void TabIconView::Update() {
 
 void TabIconView::PaintThrobber(ChromeCanvas* canvas) {
   int image_size = g_throbber_frames->height();
-  int image_offset = throbber_frame_ * image_size;
-  canvas->DrawBitmapInt(is_light_ ? *g_throbber_frames_light :
-                                    *g_throbber_frames,
-                        image_offset, 0, image_size, image_size,
-                        0, 0, image_size, image_size, false);
+  PaintIcon(canvas, is_light_ ? *g_throbber_frames_light : *g_throbber_frames,
+            throbber_frame_ * image_size, 0, image_size, image_size, false);
 }
 
 void TabIconView::PaintFavIcon(ChromeCanvas* canvas, const SkBitmap& bitmap) {
-  int bw = bitmap.width();
-  int bh = bitmap.height();
-  if (bw <= kFavIconSize && bh <= kFavIconSize) {
-    canvas->DrawBitmapInt(bitmap, (width() - kFavIconSize) / 2,
-                          (height() - kFavIconSize) / 2);
+  PaintIcon(canvas, bitmap, 0, 0, bitmap.width(), bitmap.height(), true);
+}
+
+void TabIconView::PaintIcon(ChromeCanvas* canvas,
+                            const SkBitmap& bitmap,
+                            int src_x,
+                            int src_y,
+                            int src_w,
+                            int src_h,
+                            bool filter) {
+  // For source images smaller than the favicon square, scale them as if they
+  // were padded to fit the favicon square, so we don't blow up tiny favicons
+  // into larger or nonproportional results.
+  float float_src_w = static_cast<float>(src_w);
+  float float_src_h = static_cast<float>(src_h);
+  float scalable_w, scalable_h;
+  if (src_w <= kFavIconSize && src_h <= kFavIconSize) {
+    scalable_w = scalable_h = kFavIconSize;
   } else {
-    canvas->DrawBitmapInt(bitmap, 0, 0, bw, bh, 0, 0, width(), height(),
-                          true);
+    scalable_w = float_src_w;
+    scalable_h = float_src_h;
   }
+
+  // Scale proportionately.
+  float scale = std::min(static_cast<float>(width()) / scalable_w,
+                         static_cast<float>(height()) / scalable_h);
+  int dest_w = static_cast<int>(float_src_w * scale);
+  int dest_h = static_cast<int>(float_src_h * scale);
+
+  // Center the scaled image.
+  canvas->DrawBitmapInt(bitmap, src_x, src_y, src_w, src_h,
+                        (width() - dest_w) / 2, (height() - dest_h) / 2, dest_w,
+                        dest_h, filter);
 }
 
 void TabIconView::Paint(ChromeCanvas* canvas) {
diff --git a/chrome/browser/views/tab_icon_view.h b/chrome/browser/views/tab_icon_view.h
index 43302228..a644163 100644
--- a/chrome/browser/views/tab_icon_view.h
+++ b/chrome/browser/views/tab_icon_view.h
@@ -44,6 +44,13 @@ class TabIconView : public views::View {
  private:
   void PaintThrobber(ChromeCanvas* canvas);
   void PaintFavIcon(ChromeCanvas* canvas, const SkBitmap& bitmap);
+  void PaintIcon(ChromeCanvas* canvas,
+                 const SkBitmap& bitmap,
+                 int src_x,
+                 int src_y,
+                 int src_w,
+                 int src_h,
+                 bool filter);
 
   // Our model.
   TabIconViewModel* model_;
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index d0c51e7..2278437 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -401,6 +401,8 @@ void TabRenderer::Paint(ChromeCanvas* canvas) {
                               true);
       } else {
         if (!data_.favicon.isNull()) {
+          // TODO(pkasting): Use code in tab_icon_view.cc:PaintIcon() (or switch
+          // to using that class to render the favicon).
           canvas->DrawBitmapInt(data_.favicon, 0, 0,
                                 data_.favicon.width(),
                                 data_.favicon.height(),