trunk/src/ui/gfx/image/image_png_rep.cc - Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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:

Index: trunk/src/ui/gfx/image/image_png_rep.cc

===================================================================

--- trunk/src/ui/gfx/image/image_png_rep.cc (revision 224498)

+++ trunk/src/ui/gfx/image/image_png_rep.cc (working copy)

@@ -4,7 +4,6 @@

#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"

@@ -13,13 +12,13 @@

ImagePNGRep::ImagePNGRep()

: raw_data(NULL),

- scale(1.0) {

+ scale_factor(ui::SCALE_FACTOR_NONE) {

}

ImagePNGRep::ImagePNGRep(const scoped_refptr<base::RefCountedMemory>& data,

- float data_scale)

+ ui::ScaleFactor data_scale_factor)

: raw_data(data),

- scale(data_scale) {

+ scale_factor(data_scale_factor) {

}

ImagePNGRep::~ImagePNGRep() {

« no previous file with comments | « trunk/src/ui/gfx/image/image_png_rep.h ('k') | trunk/src/ui/gfx/image/image_skia.h » ('j') | no next file with comments »