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

Side by Side Diff: ui/gfx/image/image_skia_util_mac.mm

Issue 10834382: mac: Remove implicit conversion from ImageSkia to SkBitmap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/image/image_skia_util_mac.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/image/image_skia_util_mac.h" 5 #include "ui/gfx/image/image_skia_util_mac.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <limits> 8 #include <limits>
9 9
10 #import <AppKit/AppKit.h> 10 #import <AppKit/AppKit.h>
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin(); 95 for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
96 it != image_reps.end(); ++it) { 96 it != image_reps.end(); ++it) {
97 [image addRepresentation: 97 [image addRepresentation:
98 gfx::SkBitmapToNSBitmapImageRep(it->sk_bitmap())]; 98 gfx::SkBitmapToNSBitmapImageRep(it->sk_bitmap())];
99 } 99 }
100 100
101 [image setSize:NSMakeSize(image_skia.width(), image_skia.height())]; 101 [image setSize:NSMakeSize(image_skia.width(), image_skia.height())];
102 return [image.release() autorelease]; 102 return [image.release() autorelease];
103 } 103 }
104 104
105 NSImage* NSImageFromImageSkiaWithColorSpace(const gfx::ImageSkia& image_skia,
106 CGColorSpaceRef color_space) {
107 if (image_skia.empty())
108 return nil;
109
110 scoped_nsobject<NSImage> image([[NSImage alloc] init]);
111
112 const std::vector<gfx::ImageSkiaRep>& image_reps =
113 image_skia.GetRepresentations();
114 for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
115 it != image_reps.end(); ++it) {
116 [image addRepresentation:
117 gfx::SkBitmapToNSBitmapImageRepWithColorSpace(it->sk_bitmap(),
118 color_space)];
119 }
120
121 [image setSize:NSMakeSize(image_skia.width(), image_skia.height())];
122 return [image.release() autorelease];
123 }
124
105 } // namespace gfx 125 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/image/image_skia_util_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698