diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 03:25:48 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 03:25:48 +0000 |
| commit | 50b66263c3a926fd1de75248fb2100e72715696e (patch) | |
| tree | a4ad06309d29bacf1c6de692a20f7d214f8ea7ab /ui/gfx/image/image_png_rep.h | |
| parent | 2fa342b8ed9c8777f78b3ba8b344dab24a04ef97 (diff) | |
| download | chromium_src-50b66263c3a926fd1de75248fb2100e72715696e.zip chromium_src-50b66263c3a926fd1de75248fb2100e72715696e.tar.gz chromium_src-50b66263c3a926fd1de75248fb2100e72715696e.tar.bz2 | |
Remove dependency on ui::ScaleFactor from ui/gfx
As part of the work to removed dependencies on ui/base from ui/gfx I have
changed the public api to Canvas, ImageSkia, ImageSkiaRep and ImagePNGRep
to take float scale values instead of ui::ScaleFactor.
The notion of supported scale factors has been broken into 2 parts.
ui::SetSupportedScaleFactors remains and calls the
new ImageSkia::SetSupportedScales().
The initialization of the supported scale factors has been moved from layout.h
into ResourceBundle, and is done explicitly in tests that don't use
ResourceBundle.
BUG=103304
R=ben@chromium.org, oshima@chromium.org, sky@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=224473
Review URL: https://codereview.chromium.org/24175004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/image/image_png_rep.h')
| -rw-r--r-- | ui/gfx/image/image_png_rep.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gfx/image/image_png_rep.h b/ui/gfx/image/image_png_rep.h index 7e5ce5b..98e37454 100644 --- a/ui/gfx/image/image_png_rep.h +++ b/ui/gfx/image/image_png_rep.h @@ -6,7 +6,6 @@ #define UI_GFX_IMAGE_IMAGE_PNG_REP_H_ #include "base/memory/ref_counted_memory.h" -#include "ui/base/layout.h" #include "ui/gfx/gfx_export.h" namespace gfx { @@ -15,9 +14,10 @@ class Size; // An ImagePNGRep represents a bitmap's png encoded data and the scale factor it // was intended for. struct UI_EXPORT ImagePNGRep { + public: ImagePNGRep(); ImagePNGRep(const scoped_refptr<base::RefCountedMemory>& data, - ui::ScaleFactor data_scale_factor); + float data_scale); ~ImagePNGRep(); // Width and height of the image, in pixels. @@ -27,7 +27,7 @@ struct UI_EXPORT ImagePNGRep { gfx::Size Size() const; scoped_refptr<base::RefCountedMemory> raw_data; - ui::ScaleFactor scale_factor; + float scale; }; } // namespace gfx |