ui/gfx/image/image_skia_util_mac.mm - Issue 10820049: Load 2x resources on demand

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_skia_util_mac.mm

Issue 10820049: Load 2x resources on demand (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanup Created 8 years, 4 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: ui/gfx/image/image_skia_util_mac.mm

diff --git a/ui/gfx/image/image_skia_util_mac.mm b/ui/gfx/image/image_skia_util_mac.mm

index 5eb618550912dea54d207d537a9a34229e31f9c7..226953bb77266394e73a94584c9ac6151445482f 100644

--- a/ui/gfx/image/image_skia_util_mac.mm

+++ b/ui/gfx/image/image_skia_util_mac.mm

@@ -90,8 +90,8 @@ NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia) {

return nil;

scoped_nsobject<NSImage> image([[NSImage alloc] init]);

- std::vector<gfx::ImageSkiaRep> image_reps = image_skia.GetRepresentations();

+ image_skia.EnsureRepsForSupportedScaleFactors();

+ std::vector<gfx::ImageSkiaRep> image_reps = image_skia.image_reps();

for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();

it != image_reps.end(); ++it) {

[image addRepresentation:

@@ -108,9 +108,8 @@ NSImage* NSImageFromImageSkiaWithColorSpace(const gfx::ImageSkia& image_skia,