Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: ui/views/painter.h

Issue 10447053: Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/button_drag_utils.cc ('k') | ui/views/painter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/painter.h
diff --git a/ui/views/painter.h b/ui/views/painter.h
index 48a0a8ee2a44b1dc93d3d49b160c7555b049bb1c..85f72140081d536970a7ea2e8f2ba61debd61c8c 100644
--- a/ui/views/painter.h
+++ b/ui/views/painter.h
@@ -11,10 +11,9 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/views/views_export.h"
-class SkBitmap;
-
namespace gfx {
class Canvas;
+class ImageSkia;
class Insets;
class Rect;
class Size;
@@ -43,7 +42,7 @@ class VIEWS_EXPORT Painter {
// insets.left()xinsets.right()). The four edges are stretched to fill the
// destination size.
// Ownership is passed to the caller.
- static Painter* CreateImagePainter(const SkBitmap& image,
+ static Painter* CreateImagePainter(const gfx::ImageSkia& image,
const gfx::Insets& insets,
bool paint_center);
@@ -82,7 +81,7 @@ class VIEWS_EXPORT HorizontalPainter : public Painter {
// The height.
int height_;
// NOTE: the images are owned by ResourceBundle. Don't free them.
- const SkBitmap* images_[3];
+ const gfx::ImageSkia* images_[3];
DISALLOW_COPY_AND_ASSIGN(HorizontalPainter);
};
« no previous file with comments | « ui/views/button_drag_utils.cc ('k') | ui/views/painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698