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

Unified Diff: ui/views/controls/image_view.cc

Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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
Index: ui/views/controls/image_view.cc
diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc
index e09603df32d2546b674251bc672c85a3125d331d..bf8043ddeca98e307d3be475580455ef0a7388b4 100644
--- a/ui/views/controls/image_view.cc
+++ b/ui/views/controls/image_view.cc
@@ -22,9 +22,9 @@ ImageView::ImageView()
ImageView::~ImageView() {
}
-void ImageView::SetImage(const SkBitmap& bm) {
+void ImageView::SetImage(const gfx::ImageSkia& img) {
gfx::Size pref_size(GetPreferredSize());
- image_ = bm;
+ image_ = img;
if (pref_size != GetPreferredSize())
PreferredSizeChanged();
SchedulePaint();
@@ -34,12 +34,12 @@ void ImageView::SetImage(const gfx::ImageSkia* image_skia) {
if (image_skia) {
SetImage(*image_skia);
} else {
- SkBitmap t;
+ gfx::ImageSkia t;
SetImage(t);
}
}
-const SkBitmap& ImageView::GetImage() {
+const gfx::ImageSkia& ImageView::GetImage() {
return image_;
}
@@ -119,7 +119,6 @@ void ImageView::OnPaint(gfx::Canvas* canvas) {
if (image_bounds.size() != gfx::Size(image_.width(), image_.height())) {
// Resize case
- image_.buildMipMap(false);
SkPaint paint;
paint.setFilterBitmap(true);
canvas->DrawBitmapInt(image_, 0, 0, image_.width(), image_.height(),

Powered by Google App Engine
This is Rietveld 408576698