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

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

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix new usage of scale in FastShowPickler Created 7 years, 3 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_png_rep.h ('k') | ui/gfx/image/image_skia.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_png_rep.cc
diff --git a/ui/gfx/image/image_png_rep.cc b/ui/gfx/image/image_png_rep.cc
index 253a5291afde3d49da42e9cc138efdb48317f5b1..3970d2bcc02e061c2c65e398ab25ce549cf5ac00 100644
--- a/ui/gfx/image/image_png_rep.cc
+++ b/ui/gfx/image/image_png_rep.cc
@@ -4,6 +4,7 @@
#include "ui/gfx/image/image_png_rep.h"
+#include "base/logging.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/size.h"
@@ -12,13 +13,13 @@ namespace gfx {
ImagePNGRep::ImagePNGRep()
: raw_data(NULL),
- scale_factor(ui::SCALE_FACTOR_NONE) {
+ scale(1.0) {
}
ImagePNGRep::ImagePNGRep(const scoped_refptr<base::RefCountedMemory>& data,
- ui::ScaleFactor data_scale_factor)
+ float data_scale)
: raw_data(data),
- scale_factor(data_scale_factor) {
+ scale(data_scale) {
}
ImagePNGRep::~ImagePNGRep() {
« no previous file with comments | « ui/gfx/image/image_png_rep.h ('k') | ui/gfx/image/image_skia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698