Makes ImageSkia more like SkBitmap

ui/gfx/canvas.h

 // 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.
 
 #ifndef UI_GFX_CANVAS_H_
 #define UI_GFX_CANVAS_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "skia/ext/platform_canvas.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 
 class SkBitmap;
 
 namespace ui {
 class Transform;
 }
 
 namespace gfx {
 
@@ skipping 208 matching lines @@
                   int radius,
                   const SkPaint& paint);
 
   // Draws the given rectangle with rounded corners of |radius| using the
   // given |paint| parameters.
   void DrawRoundRect(const gfx::Rect& rect, int radius, const SkPaint& paint);
 
   // Draws the given path using the given |paint| parameters.
   void DrawPath(const SkPath& path, const SkPaint& paint);
 
-  // Draws a bitmap with the origin at the specified location. The upper left
+  // Draws an image with the origin at the specified location. The upper left
   // corner of the bitmap is rendered at the specified location.
-  void DrawBitmapInt(const SkBitmap& bitmap, int x, int y);
+  // Parameters are specified relative to current canvas scale not pixels.
+  // Thus, |x| is 2 pixels if canvas scale = 2 & |x| = 1.
+  void DrawBitmapInt(const gfx::ImageSkia&, int x, int y);
 
-  // Draws a bitmap with the origin at the specified location, using the
+  // Draws an image with the origin at the specified location, using the
   // specified paint. The upper left corner of the bitmap is rendered at the
   // specified location.
-  void DrawBitmapInt(const SkBitmap& bitmap,
+  // Parameters are specified relative to current canvas scale not pixels.
+  // Thus, |x| is 2 pixels if canvas scale = 2 & |x| = 1.
+  void DrawBitmapInt(const gfx::ImageSkia& image,
                      int x, int y,
                      const SkPaint& paint);
 
-  // Draws a portion of a bitmap in the specified location. The src parameters
+  // Draws a portion of an image in the specified location. The src parameters
   // correspond to the region of the bitmap to draw in the region defined
   // by the dest coordinates.
   //
   // If the width or height of the source differs from that of the destination,
   // the bitmap will be scaled. When scaling down, it is highly recommended
-  // that you call buildMipMap(false) on your bitmap to ensure that it has
+  // that you call BuildMipMap() on your image to ensure that it has
   // a mipmap, which will result in much higher-quality output. Set |filter|
-  // to use filtering for bitmaps, otherwise the nearest-neighbor algorithm
+  // to use filtering for images, otherwise the nearest-neighbor algorithm
   // is used for resampling.
   //
   // An optional custom SkPaint can be provided.
-  void DrawBitmapInt(const SkBitmap& bitmap,
+  // Parameters are specified relative to current canvas scale not pixels.
+  // Thus, |x| is 2 pixels if canvas scale = 2 & |x| = 1.
+  void DrawBitmapInt(const gfx::ImageSkia& image,
                      int src_x, int src_y, int src_w, int src_h,
                      int dest_x, int dest_y, int dest_w, int dest_h,
                      bool filter);
-  void DrawBitmapInt(const SkBitmap& bitmap,
+  void DrawBitmapInt(const gfx::ImageSkia& image,
                      int src_x, int src_y, int src_w, int src_h,
                      int dest_x, int dest_y, int dest_w, int dest_h,
                      bool filter,
                      const SkPaint& paint);
 
-  // TODO(pkotwicz): make this function private once gfx::ImageSkia stops
-  // calling this method.
-  void DrawBitmapFloat(const SkBitmap& bitmap,
-                       float src_x, float src_y, float src_w, float src_h,
-                       float dest_x, float dest_y, float dest_w, float dest_h,
-                       bool filter,
-                       const SkPaint& paint);
-
   // Draws text with the specified color, font and location. The text is
   // aligned to the left, vertically centered, clipped to the region. If the
   // text is too big, it is truncated and '...' is added to the end.
   void DrawStringInt(const string16& text,
                      const gfx::Font& font,
                      SkColor color,
                      int x, int y, int w, int h);
   void DrawStringInt(const string16& text,
                      const gfx::Font& font,
                      SkColor color,
@@ skipping 14 matching lines @@
                              const gfx::Font& font,
                              SkColor color,
                              const gfx::Rect& text_bounds,
                              int flags,
                              const std::vector<ShadowValue>& shadows);
 
   // Draws a dotted gray rectangle used for focus purposes.
   void DrawFocusRect(const gfx::Rect& rect);
 
   // Tiles the image in the specified region.
-  void TileImageInt(const SkBitmap& bitmap,
+  // Parameters are specified relative to current canvas scale not pixels.
+  // Thus, |x| is 2 pixels if canvas scale = 2 & |x| = 1.
+  void TileImageInt(const gfx::ImageSkia& image,
                     int x, int y, int w, int h);
-  void TileImageInt(const SkBitmap& bitmap,
+  void TileImageInt(const gfx::ImageSkia& image,
                     int src_x, int src_y,
                     int dest_x, int dest_y, int w, int h);
 
   // Returns a native drawing context for platform specific drawing routines to
   // use. Must be balanced by a call to EndPlatformPaint().
   NativeDrawingContext BeginPlatformPaint();
 
   // Signifies the end of platform drawing using the native drawing context
   // returned by BeginPlatformPaint().
   void EndPlatformPaint();
@@ skipping 16 matching lines @@
 #endif
 
   skia::PlatformCanvas* platform_canvas() const { return owned_canvas_.get(); }
   SkCanvas* sk_canvas() const { return canvas_; }
 
  private:
   // Test whether the provided rectangle intersects the current clip rect.
   bool IntersectsClipRectInt(int x, int y, int w, int h);
   bool IntersectsClipRect(const gfx::Rect& rect);
 
+  // Returns bitmap whose density best matches the current canvas scale.
+  const SkBitmap* GetBitmapToPaint(const gfx::ImageSkia& image) const;
+
 #if defined(OS_WIN)
   // Draws text with the specified color, font and location. The text is
   // aligned to the left, vertically centered, clipped to the region. If the
   // text is too big, it is truncated and '...' is added to the end.
   void DrawStringInt(const string16& text,
                      HFONT font,
                      SkColor color,
                      const gfx::Rect& text_bounds,
                      int flags);
 #endif
 
   scoped_ptr<skia::PlatformCanvas> owned_canvas_;
   SkCanvas* canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(Canvas);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CANVAS_H_