Index: ui/gfx/image/image_skia_rep.cc |
diff --git a/ui/gfx/image/image_skia_rep.cc b/ui/gfx/image/image_skia_rep.cc |
index f8f3acb19468e0ff8a295880d136734f11a7bfce..aeb027f17d66c3876d3ec82cdfecdd670d905ff8 100644 |
--- a/ui/gfx/image/image_skia_rep.cc |
+++ b/ui/gfx/image/image_skia_rep.cc |
@@ -4,9 +4,11 @@ |
#include "ui/gfx/image/image_skia_rep.h" |
+#include "base/logging.h" |
+ |
namespace gfx { |
-ImageSkiaRep::ImageSkiaRep() : scale_(1.0f) { |
+ImageSkiaRep::ImageSkiaRep() : scale_(0.0f) { |
} |
ImageSkiaRep::~ImageSkiaRep() { |
@@ -14,8 +16,8 @@ ImageSkiaRep::~ImageSkiaRep() { |
ImageSkiaRep::ImageSkiaRep(const gfx::Size& size, float scale) : scale_(scale) { |
bitmap_.setConfig(SkBitmap::kARGB_8888_Config, |
- static_cast<int>(size.width() * scale), |
- static_cast<int>(size.height() * scale)); |
+ static_cast<int>(size.width() * this->scale()), |
+ static_cast<int>(size.height() * this->scale())); |
bitmap_.allocPixels(); |
} |
@@ -25,11 +27,17 @@ ImageSkiaRep::ImageSkiaRep(const SkBitmap& src, float scale) |
} |
int ImageSkiaRep::GetWidth() const { |
- return static_cast<int>(bitmap_.width() / scale_); |
+ return static_cast<int>(bitmap_.width() / scale()); |
} |
int ImageSkiaRep::GetHeight() const { |
- return static_cast<int>(bitmap_.height() / scale_); |
+ return static_cast<int>(bitmap_.height() / scale()); |
+} |
+ |
+void ImageSkiaRep::SetScaled() { |
+ DCHECK_EQ(0.0f, scale_); |
+ if (scale_ == 0.0f) |
+ scale_ = 1.0f; |
} |
} // namespace gfx |