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

Unified Diff: ui/gfx/image/image_skia_rep.cc

Issue 10696130: Get rid of implicit conversion to and from ImageSkiaRep (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/gfx/image/image_skia_rep.h ('k') | ui/views/controls/menu/menu_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 be0331a3038780da00a2d7f3a21146c71c6bf8c1..c4c0d9cd3fdf526f4f553ae21e439c9ec7ba3dde 100644
--- a/ui/gfx/image/image_skia_rep.cc
+++ b/ui/gfx/image/image_skia_rep.cc
@@ -25,27 +25,12 @@ ImageSkiaRep::ImageSkiaRep(const gfx::Size& size,
bitmap_.allocPixels();
}
-ImageSkiaRep::ImageSkiaRep(const SkBitmap& src)
- : bitmap_(src),
- scale_factor_(ui::SCALE_FACTOR_NONE) {
-}
-
ImageSkiaRep::ImageSkiaRep(const SkBitmap& src,
ui::ScaleFactor scale_factor)
: bitmap_(src),
scale_factor_(scale_factor) {
}
-ImageSkiaRep& ImageSkiaRep::operator=(const SkBitmap& other) {
- bitmap_ = other;
- scale_factor_ = ui::SCALE_FACTOR_NONE;
- return *this;
-}
-
-ImageSkiaRep::operator SkBitmap&() const {
- return const_cast<SkBitmap&>(bitmap_);
-}
-
int ImageSkiaRep::GetWidth() const {
return static_cast<int>(bitmap_.width() /
ui::GetScaleFactorScale(scale_factor_));
« no previous file with comments | « ui/gfx/image/image_skia_rep.h ('k') | ui/views/controls/menu/menu_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698