ui/gfx/image/image_mac.mm - Issue 10535079: Revert 141206 - NSImageRep can have a size which is not it's pixel size.

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: ui/gfx/image/image_mac.mm

Issue 10535079: Revert 141206 - NSImageRep can have a size which is not it's pixel size. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 6 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

Index: ui/gfx/image/image_mac.mm

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

--- ui/gfx/image/image_mac.mm (revision 141213)

+++ ui/gfx/image/image_mac.mm (working copy)

@@ -17,8 +17,7 @@

gfx::ImageSkia NSImageToImageSkia(NSImage* image) {

gfx::ImageSkia image_skia;

for (NSImageRep* imageRep in [image representations]) {

- NSSize imageRepSize =

- NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh]);

+ NSSize imageRepSize = [imageRep size];

SkBitmap bitmap(gfx::NSImageRepToSkBitmap(imageRep, imageRepSize, false));

if (!bitmap.isNull() && !bitmap.empty()) {

float scaleFactor = imageRepSize.width / [image size].width;

« no previous file with comments | « no previous file | ui/gfx/image/image_mac_unittest.mm » ('j') | no next file with comments »