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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/gfx/image/image_skia_rep.h" 5 #include "ui/gfx/image/image_skia_rep.h"
6 6
7 #include "ui/gfx/size.h" 7 #include "ui/gfx/size.h"
8 8
9 namespace gfx { 9 namespace gfx {
10 10
11 ImageSkiaRep::ImageSkiaRep() 11 ImageSkiaRep::ImageSkiaRep()
12 : scale_factor_(ui::SCALE_FACTOR_NONE) { 12 : scale_factor_(ui::SCALE_FACTOR_NONE) {
13 } 13 }
14 14
15 ImageSkiaRep::~ImageSkiaRep() { 15 ImageSkiaRep::~ImageSkiaRep() {
16 } 16 }
17 17
18 ImageSkiaRep::ImageSkiaRep(const gfx::Size& size, 18 ImageSkiaRep::ImageSkiaRep(const gfx::Size& size,
19 ui::ScaleFactor scale_factor) 19 ui::ScaleFactor scale_factor)
20 : scale_factor_(scale_factor) { 20 : scale_factor_(scale_factor) {
21 float scale = ui::GetScaleFactorScale(scale_factor); 21 float scale = ui::GetScaleFactorScale(scale_factor);
22 bitmap_.setConfig(SkBitmap::kARGB_8888_Config, 22 bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
23 static_cast<int>(size.width() * scale), 23 static_cast<int>(size.width() * scale),
24 static_cast<int>(size.height() * scale)); 24 static_cast<int>(size.height() * scale));
25 bitmap_.allocPixels(); 25 bitmap_.allocPixels();
26 } 26 }
27 27
28 ImageSkiaRep::ImageSkiaRep(const SkBitmap& src)
29 : bitmap_(src),
30 scale_factor_(ui::SCALE_FACTOR_NONE) {
31 }
32
33 ImageSkiaRep::ImageSkiaRep(const SkBitmap& src, 28 ImageSkiaRep::ImageSkiaRep(const SkBitmap& src,
34 ui::ScaleFactor scale_factor) 29 ui::ScaleFactor scale_factor)
35 : bitmap_(src), 30 : bitmap_(src),
36 scale_factor_(scale_factor) { 31 scale_factor_(scale_factor) {
37 } 32 }
38 33
39 ImageSkiaRep& ImageSkiaRep::operator=(const SkBitmap& other) {
40 bitmap_ = other;
41 scale_factor_ = ui::SCALE_FACTOR_NONE;
42 return *this;
43 }
44
45 ImageSkiaRep::operator SkBitmap&() const {
46 return const_cast<SkBitmap&>(bitmap_);
47 }
48
49 int ImageSkiaRep::GetWidth() const { 34 int ImageSkiaRep::GetWidth() const {
50 return static_cast<int>(bitmap_.width() / 35 return static_cast<int>(bitmap_.width() /
51 ui::GetScaleFactorScale(scale_factor_)); 36 ui::GetScaleFactorScale(scale_factor_));
52 } 37 }
53 38
54 int ImageSkiaRep::GetHeight() const { 39 int ImageSkiaRep::GetHeight() const {
55 return static_cast<int>(bitmap_.height() / 40 return static_cast<int>(bitmap_.height() /
56 ui::GetScaleFactorScale(scale_factor_)); 41 ui::GetScaleFactorScale(scale_factor_));
57 } 42 }
58 43
59 float ImageSkiaRep::GetScale() const { 44 float ImageSkiaRep::GetScale() const {
60 return ui::GetScaleFactorScale(scale_factor_); 45 return ui::GetScaleFactorScale(scale_factor_);
61 } 46 }
62 47
63 } // namespace gfx 48 } // namespace gfx
OLDNEW
« 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