Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

ui/views/controls/button/text_button.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 "ui/views/controls/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 72 matching lines @@
 
 TextButtonBorder::TextButtonBorder()
     : vertical_padding_(kPreferredPaddingVertical) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   BorderImageSet normal_set = {
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   };
   set_normal_set(normal_set);
 
   BorderImageSet hot_set = {
-    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_LEFT_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_RIGHT_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_LEFT_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_CENTER_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_RIGHT_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_LEFT_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_H).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_RIGHT_H).ToSkBitmap(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_LEFT_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_RIGHT_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_LEFT_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_CENTER_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_RIGHT_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_LEFT_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_H).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_RIGHT_H).ToImageSkia(),
   };
   set_hot_set(hot_set);
 
   BorderImageSet pushed_set = {
-    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_LEFT_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_RIGHT_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_LEFT_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_CENTER_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_RIGHT_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_LEFT_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_P).ToSkBitmap(),
-    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_RIGHT_P).ToSkBitmap(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_LEFT_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_TOP_RIGHT_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_LEFT_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_CENTER_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_RIGHT_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_LEFT_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_P).ToImageSkia(),
+    rb.GetImageNamed(IDR_TEXTBUTTON_BOTTOM_RIGHT_P).ToImageSkia(),
   };
   set_pushed_set(pushed_set);
 }
 
 TextButtonBorder::~TextButtonBorder() {
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 382 matching lines @@
     OnPaintBorder(canvas);
     OnPaintFocusBorder(canvas);
   }
 
   gfx::Rect text_bounds(GetTextBounds());
   if (text_bounds.width() > 0) {
     // Because the text button can (at times) draw multiple elements on the
     // canvas, we can not mirror the button by simply flipping the canvas as
     // doing this will mirror the text itself. Flipping the canvas will also
     // make the icons look wrong because icons are almost always represented as
-    // direction-insensitive bitmaps and such bitmaps should never be flipped
+    // direction-insensitive images and such images should never be flipped
     // horizontally.
     //
     // Due to the above, we must perform the flipping manually for RTL UIs.
     text_bounds.set_x(GetMirroredXForRect(text_bounds));
 
     SkColor text_color = (show_multiple_icon_states_ &&
         (state() == BS_HOT || state() == BS_PUSHED)) ? color_hover_ : color_;
 
     int draw_string_flags = gfx::Canvas::DefaultCanvasTextAlignment() |
         ComputeCanvasStringFlags();
@@ skipping 133 matching lines @@
       has_hover_icon_(false),
       has_pushed_icon_(false),
       icon_text_spacing_(kDefaultIconTextSpacing),
       ignore_minimum_size_(true) {
   set_border(new TextButtonBorder);
 }
 
 TextButton::~TextButton() {
 }
 
-void TextButton::SetIcon(const SkBitmap& icon) {
+void TextButton::SetIcon(const gfx::ImageSkia& icon) {
   icon_ = icon;
   SchedulePaint();
 }
 
-void TextButton::SetHoverIcon(const SkBitmap& icon) {
+void TextButton::SetHoverIcon(const gfx::ImageSkia& icon) {
   icon_hover_ = icon;
   has_hover_icon_ = true;
   SchedulePaint();
 }
 
-void TextButton::SetPushedIcon(const SkBitmap& icon) {
+void TextButton::SetPushedIcon(const gfx::ImageSkia& icon) {
   icon_pushed_ = icon;
   has_pushed_icon_ = true;
   SchedulePaint();
 }
 
 gfx::Size TextButton::GetPreferredSize() {
   gfx::Size prefsize(TextButtonBase::GetPreferredSize());
   prefsize.Enlarge(icon_.width(), 0);
   prefsize.set_height(std::max(prefsize.height(), icon_.height()));
 
@@ skipping 17 matching lines @@
         platform_font->vertical_dlus_to_pixels(kMinHeightDLUs)));
   }
 #endif
 
   return prefsize;
 }
 
 void TextButton::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
   TextButtonBase::PaintButton(canvas, mode);
 
-  const SkBitmap& icon = GetImageToPaint();
+  const gfx::ImageSkia& icon = GetImageToPaint();
 
   if (icon.width() > 0) {
     gfx::Rect text_bounds = GetTextBounds();
     int icon_x;
     int spacing = text_.empty() ? 0 : icon_text_spacing_;
     if (icon_placement_ == ICON_ON_LEFT) {
       icon_x = text_bounds.x() - icon.width() - spacing;
     } else {
       icon_x = text_bounds.right() + spacing;
     }
@@ skipping 30 matching lines @@
 }
 
 void TextButton::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
   TextButtonBase::GetExtraParams(params);
   params->button.is_default = is_default_;
 }
 
 gfx::Rect TextButton::GetTextBounds() const {
   int extra_width = 0;
 
-  const SkBitmap& icon = GetImageToPaint();
+  const gfx::ImageSkia& icon = GetImageToPaint();
   if (icon.width() > 0)
     extra_width = icon.width() + (text_.empty() ? 0 : icon_text_spacing_);
 
   gfx::Rect bounds(GetContentBounds(extra_width));
 
   if (extra_width > 0) {
     // Make sure the icon is always fully visible.
     if (icon_placement_ == ICON_ON_LEFT) {
       bounds.Inset(extra_width, 0, 0, 0);
     } else {
       bounds.Inset(0, 0, extra_width, 0);
     }
   }
 
   return bounds;
 }
 
-const SkBitmap& TextButton::GetImageToPaint() const {
+const gfx::ImageSkia& TextButton::GetImageToPaint() const {
   if (show_multiple_icon_states_) {
     if (has_hover_icon_ && (state() == BS_HOT))
       return icon_hover_;
     if (has_pushed_icon_ && (state() == BS_PUSHED))
       return icon_pushed_;
   }
   return icon_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 47 matching lines @@
 #endif
 }
 
 void NativeTextButton::GetExtraParams(
     ui::NativeTheme::ExtraParams* params) const {
   TextButton::GetExtraParams(params);
   params->button.has_border = true;
 }
 
 }  // namespace views