| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/controls/image_view.h" | 5 #include "ui/views/controls/image_view.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 58 |
| 59 void ImageView::SetImage(const gfx::ImageSkia* image_skia) { | 59 void ImageView::SetImage(const gfx::ImageSkia* image_skia) { |
| 60 if (image_skia) { | 60 if (image_skia) { |
| 61 SetImage(*image_skia); | 61 SetImage(*image_skia); |
| 62 } else { | 62 } else { |
| 63 gfx::ImageSkia t; | 63 gfx::ImageSkia t; |
| 64 SetImage(t); | 64 SetImage(t); |
| 65 } | 65 } |
| 66 } | 66 } |
| 67 | 67 |
| 68 const gfx::ImageSkia& ImageView::GetImage() { | 68 const gfx::ImageSkia& ImageView::GetImage() const { |
| 69 return image_; | 69 return image_; |
| 70 } | 70 } |
| 71 | 71 |
| 72 void ImageView::SetImageSize(const gfx::Size& image_size) { | 72 void ImageView::SetImageSize(const gfx::Size& image_size) { |
| 73 image_size_set_ = true; | 73 image_size_set_ = true; |
| 74 image_size_ = image_size; | 74 image_size_ = image_size; |
| 75 PreferredSizeChanged(); | 75 PreferredSizeChanged(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 gfx::Rect ImageView::GetImageBounds() const { | 78 gfx::Rect ImageView::GetImageBounds() const { |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(), | 226 canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(), |
| 227 image_bounds.x(), image_bounds.y(), image_bounds.width(), | 227 image_bounds.x(), image_bounds.y(), image_bounds.width(), |
| 228 image_bounds.height(), true, paint); | 228 image_bounds.height(), true, paint); |
| 229 } else { | 229 } else { |
| 230 canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y()); | 230 canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y()); |
| 231 } | 231 } |
| 232 last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_); | 232 last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_); |
| 233 } | 233 } |
| 234 | 234 |
| 235 } // namespace views | 235 } // namespace views |
| OLD | NEW |