Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia

ui/views/bubble/bubble_border.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/bubble/bubble_border.h"
 
 #include <algorithm>  // for std::max
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_resources_standard.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"

[msw, 2012/05/29 07:49:16]

Drive by nit: Run tools/sort-headers.py on the files touched in this CL.
Also consider related past CLs; I found several similar nits in:
http://codereview.chromium.org/10437006

 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 
 namespace views {
 
 struct BubbleBorder::BorderImages {
   BorderImages()
       : left(NULL),
         top_left(NULL),
         top(NULL),
         top_right(NULL),
         right(NULL),
         bottom_right(NULL),
         bottom(NULL),
         bottom_left(NULL),
         left_arrow(NULL),
         top_arrow(NULL),
         right_arrow(NULL),
         bottom_arrow(NULL),
         border_thickness(0) {
   }
 
-  SkBitmap* left;
-  SkBitmap* top_left;
-  SkBitmap* top;
-  SkBitmap* top_right;
-  SkBitmap* right;
-  SkBitmap* bottom_right;
-  SkBitmap* bottom;
-  SkBitmap* bottom_left;
-  SkBitmap* left_arrow;
-  SkBitmap* top_arrow;
-  SkBitmap* right_arrow;
-  SkBitmap* bottom_arrow;
+  gfx::ImageSkia* left;
+  gfx::ImageSkia* top_left;
+  gfx::ImageSkia* top;
+  gfx::ImageSkia* top_right;
+  gfx::ImageSkia* right;
+  gfx::ImageSkia* bottom_right;
+  gfx::ImageSkia* bottom;
+  gfx::ImageSkia* bottom_left;
+  gfx::ImageSkia* left_arrow;
+  gfx::ImageSkia* top_arrow;
+  gfx::ImageSkia* right_arrow;
+  gfx::ImageSkia* bottom_arrow;
   int border_thickness;
 };
 
 // static
 struct BubbleBorder::BorderImages* BubbleBorder::normal_images_ = NULL;
 struct BubbleBorder::BorderImages* BubbleBorder::shadow_images_ = NULL;
 
 // The height inside the arrow image, in pixels.
 static const int kArrowInteriorHeight = 7;
 
@@ skipping 26 matching lines @@
 gfx::Rect BubbleBorder::GetBounds(const gfx::Rect& position_relative_to,
                                   const gfx::Size& contents_size) const {
   // Desired size is size of contents enlarged by the size of the border images.
   gfx::Size border_size(contents_size);
   gfx::Insets insets;
   GetInsets(&insets);
   border_size.Enlarge(insets.width(), insets.height());
 
   // Screen position depends on the arrow location.
   // The arrow should overlap the target by some amount since there is space
-  // for shadow between arrow tip and bitmap bounds.
+  // for shadow between arrow tip and image bounds.
   const int kArrowOverlap = 3;
   int x = position_relative_to.x();
   int y = position_relative_to.y();
   int w = position_relative_to.width();
   int h = position_relative_to.height();
   int arrow_offset = override_arrow_offset_ ? override_arrow_offset_ :
                                               arrow_offset_;
 
   // Calculate bubble x coordinate.
   switch (arrow_location_) {
@@ skipping 112 matching lines @@
           border_size.width() : border_size.height()) - arrow_offset_));
   override_arrow_offset_ = offset;
   return override_arrow_offset_;
 }
 
 // static
 BubbleBorder::BorderImages* BubbleBorder::GetBorderImages(Shadow shadow) {
   if (shadow == SHADOW && shadow_images_ == NULL) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     shadow_images_ = new BorderImages();
-    shadow_images_->left = rb.GetBitmapNamed(IDR_BUBBLE_SHADOW_L);
-    shadow_images_->top_left = rb.GetBitmapNamed(IDR_BUBBLE_SHADOW_TL);
-    shadow_images_->top = rb.GetBitmapNamed(IDR_BUBBLE_SHADOW_T);
-    shadow_images_->top_right = rb.GetBitmapNamed(IDR_BUBBLE_SHADOW_TR);
-    shadow_images_->right = rb.GetBitmapNamed(IDR_BUBBLE_SHADOW_R);
-    shadow_images_->bottom_right = rb.GetBitmapNamed(IDR_BUBBLE_SHADOW_BR);
-    shadow_images_->bottom = rb.GetBitmapNamed(IDR_BUBBLE_SHADOW_B);
-    shadow_images_->bottom_left = rb.GetBitmapNamed(IDR_BUBBLE_SHADOW_BL);
-    shadow_images_->left_arrow = new SkBitmap();
-    shadow_images_->top_arrow = new SkBitmap();
-    shadow_images_->right_arrow = new SkBitmap();
-    shadow_images_->bottom_arrow = new SkBitmap();
+    shadow_images_->left = rb.GetImageSkiaNamed(IDR_BUBBLE_SHADOW_L);
+    shadow_images_->top_left = rb.GetImageSkiaNamed(IDR_BUBBLE_SHADOW_TL);
+    shadow_images_->top = rb.GetImageSkiaNamed(IDR_BUBBLE_SHADOW_T);
+    shadow_images_->top_right = rb.GetImageSkiaNamed(IDR_BUBBLE_SHADOW_TR);
+    shadow_images_->right = rb.GetImageSkiaNamed(IDR_BUBBLE_SHADOW_R);
+    shadow_images_->bottom_right = rb.GetImageSkiaNamed(IDR_BUBBLE_SHADOW_BR);
+    shadow_images_->bottom = rb.GetImageSkiaNamed(IDR_BUBBLE_SHADOW_B);
+    shadow_images_->bottom_left = rb.GetImageSkiaNamed(IDR_BUBBLE_SHADOW_BL);
+    shadow_images_->left_arrow = new gfx::ImageSkia();
+    shadow_images_->top_arrow = new gfx::ImageSkia();
+    shadow_images_->right_arrow = new gfx::ImageSkia();
+    shadow_images_->bottom_arrow = new gfx::ImageSkia();
     shadow_images_->border_thickness = 10;
   } else if (shadow == NO_SHADOW && normal_images_ == NULL) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     normal_images_ = new BorderImages();
-    normal_images_->left = rb.GetBitmapNamed(IDR_BUBBLE_L);
-    normal_images_->top_left = rb.GetBitmapNamed(IDR_BUBBLE_TL);
-    normal_images_->top = rb.GetBitmapNamed(IDR_BUBBLE_T);
-    normal_images_->top_right = rb.GetBitmapNamed(IDR_BUBBLE_TR);
-    normal_images_->right = rb.GetBitmapNamed(IDR_BUBBLE_R);
-    normal_images_->bottom_right = rb.GetBitmapNamed(IDR_BUBBLE_BR);
-    normal_images_->bottom = rb.GetBitmapNamed(IDR_BUBBLE_B);
-    normal_images_->bottom_left = rb.GetBitmapNamed(IDR_BUBBLE_BL);
-    normal_images_->left_arrow = rb.GetBitmapNamed(IDR_BUBBLE_L_ARROW);
-    normal_images_->top_arrow = rb.GetBitmapNamed(IDR_BUBBLE_T_ARROW);
-    normal_images_->right_arrow = rb.GetBitmapNamed(IDR_BUBBLE_R_ARROW);
-    normal_images_->bottom_arrow = rb.GetBitmapNamed(IDR_BUBBLE_B_ARROW);
+    normal_images_->left = rb.GetImageSkiaNamed(IDR_BUBBLE_L);
+    normal_images_->top_left = rb.GetImageSkiaNamed(IDR_BUBBLE_TL);
+    normal_images_->top = rb.GetImageSkiaNamed(IDR_BUBBLE_T);
+    normal_images_->top_right = rb.GetImageSkiaNamed(IDR_BUBBLE_TR);
+    normal_images_->right = rb.GetImageSkiaNamed(IDR_BUBBLE_R);
+    normal_images_->bottom_right = rb.GetImageSkiaNamed(IDR_BUBBLE_BR);
+    normal_images_->bottom = rb.GetImageSkiaNamed(IDR_BUBBLE_B);
+    normal_images_->bottom_left = rb.GetImageSkiaNamed(IDR_BUBBLE_BL);
+    normal_images_->left_arrow = rb.GetImageSkiaNamed(IDR_BUBBLE_L_ARROW);
+    normal_images_->top_arrow = rb.GetImageSkiaNamed(IDR_BUBBLE_T_ARROW);
+    normal_images_->right_arrow = rb.GetImageSkiaNamed(IDR_BUBBLE_R_ARROW);
+    normal_images_->bottom_arrow = rb.GetImageSkiaNamed(IDR_BUBBLE_B_ARROW);
     normal_images_->border_thickness = 0;
   }
   return shadow == SHADOW ? shadow_images_ : normal_images_;
 }
 
 BubbleBorder::~BubbleBorder() {}
 
 void BubbleBorder::Paint(const views::View& view, gfx::Canvas* canvas) const {
   // Convenience shorthand variables.
   const int tl_width = images_->top_left->width();
@@ skipping 150 matching lines @@
     canvas->TileImageInt(*images_->bottom, left + bl_width, bottom - b_height,
                          width - bl_width - br_width, b_height);
   }
 
   // Bottom left corner.
   canvas->DrawBitmapInt(*images_->bottom_left, left, bottom - bl_height);
 }
 
 void BubbleBorder::DrawEdgeWithArrow(gfx::Canvas* canvas,
                                      bool is_horizontal,
-                                     SkBitmap* edge,
-                                     SkBitmap* arrow,
+                                     gfx::ImageSkia* edge,
+                                     gfx::ImageSkia* arrow,
                                      int start_x,
                                      int start_y,
                                      int before_arrow,
                                      int after_arrow,
                                      int offset) const {
   /* Here's what the parameters mean:
    *                     start_x
    *                       .
    *                       .        ┌───┐                 ┬ offset
    * start_y..........┌────┬────────┤ ▲ ├────────┬────┐
@@ skipping 75 matching lines @@
   paint.setColor(border_->background_color());
   SkPath path;
   gfx::Rect bounds(view->GetContentsBounds());
   bounds.Inset(-border_->border_thickness(), -border_->border_thickness());
   SkScalar radius = SkIntToScalar(BubbleBorder::GetCornerRadius());
   path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
   canvas->DrawPath(path, paint);
 }
 
 }  // namespace views