Convert most of the rest of chrome to ImageSkia

chrome/browser/download/download_util.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.
 //
 // Download utility implementation
 
 #define _USE_MATH_DEFINES  // For VC++ to get M_PI. This has to be first.
 
 #include "chrome/browser/download/download_util.h"
 
@@ skipping 165 matching lines @@
   *generated_name = net::GenerateFileName(download_item.GetURL(),
                                           download_item.GetContentDisposition(),
                                           download_item.GetReferrerCharset(),
                                           download_item.GetSuggestedFilename(),
                                           download_item.GetMimeType(),
                                           default_file_name);
 }
 
 // Download progress painting --------------------------------------------------
 
-// Common bitmaps used for download progress animations. We load them once the
+// Common images used for download progress animations. We load them once the
 // first time we do a progress paint, then reuse them as they are always the
 // same.
-SkBitmap* g_foreground_16 = NULL;
-SkBitmap* g_background_16 = NULL;
-SkBitmap* g_foreground_32 = NULL;
-SkBitmap* g_background_32 = NULL;
+gfx::ImageSkia* g_foreground_16 = NULL;
+gfx::ImageSkia* g_background_16 = NULL;
+gfx::ImageSkia* g_foreground_32 = NULL;
+gfx::ImageSkia* g_background_32 = NULL;
 
 void PaintDownloadProgress(gfx::Canvas* canvas,
 #if defined(TOOLKIT_VIEWS)
                            views::View* containing_view,
 #endif
                            int origin_x,
                            int origin_y,
                            int start_angle,
                            int percent_done,
                            PaintDownloadProgressSize size) {
-  // Load up our common bitmaps
+  // Load up our common images
   if (!g_background_16) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    g_foreground_16 = rb.GetBitmapNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_16);
-    g_background_16 = rb.GetBitmapNamed(IDR_DOWNLOAD_PROGRESS_BACKGROUND_16);
-    g_foreground_32 = rb.GetBitmapNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_32);
-    g_background_32 = rb.GetBitmapNamed(IDR_DOWNLOAD_PROGRESS_BACKGROUND_32);
+    g_foreground_16 = rb.GetImageSkiaNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_16);
+    g_background_16 = rb.GetImageSkiaNamed(IDR_DOWNLOAD_PROGRESS_BACKGROUND_16);
+    g_foreground_32 = rb.GetImageSkiaNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_32);
+    g_background_32 = rb.GetImageSkiaNamed(IDR_DOWNLOAD_PROGRESS_BACKGROUND_32);
   }
 
-  SkBitmap* background = (size == BIG) ? g_background_32 : g_background_16;
-  SkBitmap* foreground = (size == BIG) ? g_foreground_32 : g_foreground_16;
+  gfx::ImageSkia* background =
+      (size == BIG) ? g_background_32 : g_background_16;
+  gfx::ImageSkia* foreground =
+      (size == BIG) ? g_foreground_32 : g_foreground_16;
 
   const int kProgressIconSize = (size == BIG) ? kBigProgressIconSize :
                                                 kSmallProgressIconSize;
 
-  // We start by storing the bounds of the background and foreground bitmaps
+  // We start by storing the bounds of the background and foreground images
   // so that it is easy to mirror the bounds if the UI layout is RTL.
   gfx::Rect background_bounds(origin_x, origin_y,
                               background->width(), background->height());
   gfx::Rect foreground_bounds(origin_x, origin_y,
                               foreground->width(), foreground->height());
 
 #if defined(TOOLKIT_VIEWS)
   // Mirror the positions if necessary.
   int mirrored_x = containing_view->GetMirroredXForRect(background_bounds);
   background_bounds.set_x(mirrored_x);
@@ skipping 62 matching lines @@
 }
 
 void PaintDownloadComplete(gfx::Canvas* canvas,
 #if defined(TOOLKIT_VIEWS)
                            views::View* containing_view,
 #endif
                            int origin_x,
                            int origin_y,
                            double animation_progress,
                            PaintDownloadProgressSize size) {
-  // Load up our common bitmaps.
+  // Load up our common images.
   if (!g_foreground_16) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    g_foreground_16 = rb.GetBitmapNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_16);
-    g_foreground_32 = rb.GetBitmapNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_32);
+    g_foreground_16 = rb.GetImageSkiaNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_16);
+    g_foreground_32 = rb.GetImageSkiaNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_32);
   }
 
-  SkBitmap* complete = (size == BIG) ? g_foreground_32 : g_foreground_16;
+  gfx::ImageSkia* complete = (size == BIG) ? g_foreground_32 : g_foreground_16;
 
   gfx::Rect complete_bounds(origin_x, origin_y,
                             complete->width(), complete->height());
 #if defined(TOOLKIT_VIEWS)
   // Mirror the positions if necessary.
   complete_bounds.set_x(containing_view->GetMirroredXForRect(complete_bounds));
 #endif
 
   // Start at full opacity, then loop back and forth five times before ending
   // at zero opacity.
   canvas->SaveLayerAlpha(GetOpacity(animation_progress), complete_bounds);
   canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
   canvas->DrawBitmapInt(*complete, complete_bounds.x(), complete_bounds.y());
   canvas->Restore();
 }
 
 void PaintDownloadInterrupted(gfx::Canvas* canvas,
 #if defined(TOOLKIT_VIEWS)
                               views::View* containing_view,
 #endif
                               int origin_x,
                               int origin_y,
                               double animation_progress,
                               PaintDownloadProgressSize size) {
-  // Load up our common bitmaps.
+  // Load up our common images.
   if (!g_foreground_16) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    g_foreground_16 = rb.GetBitmapNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_16);
-    g_foreground_32 = rb.GetBitmapNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_32);
+    g_foreground_16 = rb.GetImageSkiaNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_16);
+    g_foreground_32 = rb.GetImageSkiaNamed(IDR_DOWNLOAD_PROGRESS_FOREGROUND_32);
   }
 
-  SkBitmap* complete = (size == BIG) ? g_foreground_32 : g_foreground_16;
+  gfx::ImageSkia* complete = (size == BIG) ? g_foreground_32 : g_foreground_16;
 
   gfx::Rect complete_bounds(origin_x, origin_y,
                             complete->width(), complete->height());
 #if defined(TOOLKIT_VIEWS)
   // Mirror the positions if necessary.
   complete_bounds.set_x(containing_view->GetMirroredXForRect(complete_bounds));
 #endif
 
   // Start at zero opacity, then loop back and forth five times before ending
   // at full opacity.
@@ skipping 305 matching lines @@
   UMA_HISTOGRAM_ENUMERATION(
       "Download.CountsChrome", type, CHROME_DOWNLOAD_COUNT_TYPES_LAST_ENTRY);
 }
 
 void RecordDownloadSource(ChromeDownloadSource source) {
   UMA_HISTOGRAM_ENUMERATION(
       "Download.SourcesChrome", source, CHROME_DOWNLOAD_SOURCE_LAST_ENTRY);
 }
 
 }  // namespace download_util