Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/tabs/tab.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/tabs/tab.h"
 
 #include <limits>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
@@ skipping 244 matching lines @@
   if (mini_title_animation_.get())
     mini_title_animation_->Stop();
 }
 
 // static
 gfx::Size Tab::GetBasicMinimumUnselectedSize() {
   InitTabResources();
 
   gfx::Size minimum_size;
   minimum_size.set_width(left_padding() + right_padding());
-  // Since we use bitmap images, the real minimum height of the image is
+  // Since we use image images, the real minimum height of the image is
   // defined most accurately by the height of the end cap images.
   minimum_size.set_height(tab_active_.image_l->height());
   return minimum_size;
 }
 
 gfx::Size Tab::GetMinimumUnselectedSize() {
   return GetBasicMinimumUnselectedSize();
 }
 
 // static
@@ skipping 235 matching lines @@
       canvas->Restore();
     }
   }
 }
 
 void Tab::PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas) {
   // Render the inactive tab background. We'll use this for clipping.
   gfx::Canvas background_canvas(size(), false);
   PaintInactiveTabBackground(&background_canvas);
 
-  SkBitmap background_image = background_canvas.ExtractBitmap();
+  gfx::ImageSkia background_image = background_canvas.ExtractBitmap();
 
   // Draw a radial gradient to hover_canvas.
   gfx::Canvas hover_canvas(size(), false);
   int radius = kMiniTitleChangeGradientRadius;
   int x0 = width() + radius - kMiniTitleChangeInitialXOffset;
   int x1 = radius;
   int x2 = -radius;
   int x;
   if (mini_title_animation_->current_part_index() == 0) {
     x = mini_title_animation_->CurrentValueBetween(x0, x1);
   } else if (mini_title_animation_->current_part_index() == 1) {
     x = x1;
   } else {
     x = mini_title_animation_->CurrentValueBetween(x1, x2);
   }
   SkPoint center_point;
   center_point.iset(x, 0);
   SkColor colors[2] = { kMiniTitleChangeGradientColor1,
                         kMiniTitleChangeGradientColor2 };
   SkShader* shader = SkGradientShader::CreateRadial(center_point,
       SkIntToScalar(radius), colors, NULL, 2, SkShader::kClamp_TileMode);
   SkPaint paint;
   paint.setShader(shader);
   shader->unref();
   hover_canvas.DrawRect(gfx::Rect(x - radius, -radius, radius * 2, radius * 2),
                         paint);
 
   // Draw the radial gradient clipped to the background into hover_image.
-  SkBitmap hover_image = SkBitmapOperations::CreateMaskedBitmap(
+  gfx::ImageSkia hover_image = SkBitmapOperations::CreateMaskedBitmap(
       hover_canvas.ExtractBitmap(), background_image);
 
   // Draw the tab background to the canvas.
   canvas->DrawBitmapInt(background_image, 0, 0);
 
   // And then the gradient on top of that.
   if (mini_title_animation_->current_part_index() == 2) {
     canvas->SaveLayerAlpha(mini_title_animation_->CurrentValueBetween(255, 0));
     canvas->DrawBitmapInt(hover_image, 0, 0);
     canvas->Restore();
   } else {
     canvas->DrawBitmapInt(hover_image, 0, 0);
   }
 }
 
 void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {
   // The tab image needs to be lined up with the background image
   // so that it feels partially transparent.  These offsets represent the tab
   // position within the frame background image.
   int offset = GetMirroredX() + background_offset_.x();
 
   int tab_id;
   if (GetWidget() && GetWidget()->GetTopLevelWidget()->ShouldUseNativeFrame()) {
     tab_id = IDR_THEME_TAB_BACKGROUND_V;
   } else {
     tab_id = data().incognito ? IDR_THEME_TAB_BACKGROUND_INCOGNITO :
                                 IDR_THEME_TAB_BACKGROUND;
   }
 
-  SkBitmap* tab_bg = GetThemeProvider()->GetBitmapNamed(tab_id);
+  gfx::ImageSkia* tab_bg = GetThemeProvider()->GetImageSkiaNamed(tab_id);
 
   TabImage* tab_image = &tab_active_;
   TabImage* tab_inactive_image = &tab_inactive_;
   TabImage* alpha = &tab_alpha_;
 
   // If the theme is providing a custom background image, then its top edge
   // should be at the top of the tab. Otherwise, we assume that the background
   // image is a composited foreground + frame image.
   int bg_offset_y = GetThemeProvider()->HasCustomImage(tab_id) ?
       0 : background_offset_.y();
 
-  // We need a gfx::Canvas object to be able to extract the bitmap from.
+  // We need a gfx::Canvas object to be able to extract the image from.
   // We draw everything to this canvas and then output it to the canvas
   // parameter in addition to using it to mask the hover glow if needed.
   gfx::Canvas background_canvas(size(), false);
 
   // Draw left edge.  Don't draw over the toolbar, as we're not the foreground
   // tab.
-  SkBitmap tab_l = SkBitmapOperations::CreateTiledBitmap(
+  gfx::ImageSkia tab_l = SkBitmapOperations::CreateTiledBitmap(
       *tab_bg, offset, bg_offset_y, tab_image->l_width, height());
-  SkBitmap theme_l =
+  gfx::ImageSkia theme_l =
       SkBitmapOperations::CreateMaskedBitmap(tab_l, *alpha->image_l);
   background_canvas.DrawBitmapInt(theme_l,
       0, 0, theme_l.width(), theme_l.height() - kToolbarOverlap,
       0, 0, theme_l.width(), theme_l.height() - kToolbarOverlap,
       false);
 
   // Draw right edge.  Again, don't draw over the toolbar.
-  SkBitmap tab_r = SkBitmapOperations::CreateTiledBitmap(*tab_bg,
+  gfx::ImageSkia tab_r = SkBitmapOperations::CreateTiledBitmap(*tab_bg,
       offset + width() - tab_image->r_width, bg_offset_y,
       tab_image->r_width, height());
-  SkBitmap theme_r =
+  gfx::ImageSkia theme_r =
       SkBitmapOperations::CreateMaskedBitmap(tab_r, *alpha->image_r);
   background_canvas.DrawBitmapInt(theme_r,
       0, 0, theme_r.width(), theme_r.height() - kToolbarOverlap,
       width() - theme_r.width(), 0, theme_r.width(),
       theme_r.height() - kToolbarOverlap, false);
 
   // Draw center.  Instead of masking out the top portion we simply skip over
   // it by incrementing by GetDropShadowHeight(), since it's a simple
   // rectangle. And again, don't draw over the toolbar.
   background_canvas.TileImageInt(*tab_bg,
@@ skipping 20 matching lines @@
                        height());
   canvas->DrawBitmapInt(*tab_inactive_image->image_r,
                         width() - tab_inactive_image->r_width, 0);
 }
 
 void Tab::PaintActiveTabBackground(gfx::Canvas* canvas) {
   int offset = GetMirroredX() + background_offset_.x();
   ui::ThemeProvider* tp = GetThemeProvider();
   DCHECK(tp) << "Unable to get theme provider";
 
-  SkBitmap* tab_bg = GetThemeProvider()->GetBitmapNamed(IDR_THEME_TOOLBAR);
+  gfx::ImageSkia* tab_bg =
+      GetThemeProvider()->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
 
   TabImage* tab_image = &tab_active_;
   TabImage* alpha = &tab_alpha_;
 
   // Draw left edge.
-  SkBitmap tab_l = SkBitmapOperations::CreateTiledBitmap(
+  gfx::ImageSkia tab_l = SkBitmapOperations::CreateTiledBitmap(
       *tab_bg, offset, 0, tab_image->l_width, height());
-  SkBitmap theme_l =
+  gfx::ImageSkia theme_l =
       SkBitmapOperations::CreateMaskedBitmap(tab_l, *alpha->image_l);
   canvas->DrawBitmapInt(theme_l, 0, 0);
 
   // Draw right edge.
-  SkBitmap tab_r = SkBitmapOperations::CreateTiledBitmap(*tab_bg,
+  gfx::ImageSkia tab_r = SkBitmapOperations::CreateTiledBitmap(*tab_bg,
       offset + width() - tab_image->r_width, 0, tab_image->r_width, height());
-  SkBitmap theme_r =
+  gfx::ImageSkia theme_r =
       SkBitmapOperations::CreateMaskedBitmap(tab_r, *alpha->image_r);
   canvas->DrawBitmapInt(theme_r, width() - tab_image->r_width, 0);
 
   // Draw center.  Instead of masking out the top portion we simply skip over it
   // by incrementing by GetDropShadowHeight(), since it's a simple rectangle.
   canvas->TileImageInt(*tab_bg,
      offset + tab_image->l_width,
      drop_shadow_height() + tab_image->y_offset,
      tab_image->l_width,
      drop_shadow_height() + tab_image->y_offset,
@@ skipping 60 matching lines @@
 
   // Load the tab images once now, and maybe again later if the theme changes.
   LoadTabImages();
 }
 
 // static
 void Tab::LoadTabImages() {
   // We're not letting people override tab images just yet.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
-  tab_alpha_.image_l = rb.GetBitmapNamed(IDR_TAB_ALPHA_LEFT);
-  tab_alpha_.image_r = rb.GetBitmapNamed(IDR_TAB_ALPHA_RIGHT);
+  tab_alpha_.image_l = rb.GetImageSkiaNamed(IDR_TAB_ALPHA_LEFT);
+  tab_alpha_.image_r = rb.GetImageSkiaNamed(IDR_TAB_ALPHA_RIGHT);
 
-  tab_active_.image_l = rb.GetBitmapNamed(IDR_TAB_ACTIVE_LEFT);
-  tab_active_.image_c = rb.GetBitmapNamed(IDR_TAB_ACTIVE_CENTER);
-  tab_active_.image_r = rb.GetBitmapNamed(IDR_TAB_ACTIVE_RIGHT);
+  tab_active_.image_l = rb.GetImageSkiaNamed(IDR_TAB_ACTIVE_LEFT);
+  tab_active_.image_c = rb.GetImageSkiaNamed(IDR_TAB_ACTIVE_CENTER);
+  tab_active_.image_r = rb.GetImageSkiaNamed(IDR_TAB_ACTIVE_RIGHT);
   tab_active_.l_width = tab_active_.image_l->width();
   tab_active_.r_width = tab_active_.image_r->width();
 
-  tab_inactive_.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
-  tab_inactive_.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
-  tab_inactive_.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
+  tab_inactive_.image_l = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_LEFT);
+  tab_inactive_.image_c = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_CENTER);
+  tab_inactive_.image_r = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive_.l_width = tab_inactive_.image_l->width();
   tab_inactive_.r_width = tab_inactive_.image_r->width();
 }