OLD | NEW |
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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"]; | 83 NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"]; |
84 return ImageSkiaFromResizedNSImage(image, | 84 return ImageSkiaFromResizedNSImage(image, |
85 NSMakeSize(desired_size, desired_size)); | 85 NSMakeSize(desired_size, desired_size)); |
86 } | 86 } |
87 | 87 |
88 NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia) { | 88 NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia) { |
89 if (image_skia.isNull()) | 89 if (image_skia.isNull()) |
90 return nil; | 90 return nil; |
91 | 91 |
92 scoped_nsobject<NSImage> image([[NSImage alloc] init]); | 92 scoped_nsobject<NSImage> image([[NSImage alloc] init]); |
93 | 93 image_skia.EnsureRepsForSupportedScaleFactors(); |
94 std::vector<gfx::ImageSkiaRep> image_reps = image_skia.GetRepresentations(); | 94 std::vector<gfx::ImageSkiaRep> image_reps = image_skia.image_reps(); |
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, | 105 NSImage* NSImageFromImageSkiaWithColorSpace(const gfx::ImageSkia& image_skia, |
106 CGColorSpaceRef color_space) { | 106 CGColorSpaceRef color_space) { |
107 if (image_skia.isNull()) | 107 if (image_skia.isNull()) |
108 return nil; | 108 return nil; |
109 | 109 |
110 scoped_nsobject<NSImage> image([[NSImage alloc] init]); | 110 scoped_nsobject<NSImage> image([[NSImage alloc] init]); |
111 | 111 image_skia.EnsureRepsForSupportedScaleFactors(); |
112 const std::vector<gfx::ImageSkiaRep>& image_reps = | 112 std::vector<gfx::ImageSkiaRep> image_reps = image_skia.image_reps(); |
113 image_skia.GetRepresentations(); | |
114 for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin(); | 113 for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin(); |
115 it != image_reps.end(); ++it) { | 114 it != image_reps.end(); ++it) { |
116 [image addRepresentation: | 115 [image addRepresentation: |
117 gfx::SkBitmapToNSBitmapImageRepWithColorSpace(it->sk_bitmap(), | 116 gfx::SkBitmapToNSBitmapImageRepWithColorSpace(it->sk_bitmap(), |
118 color_space)]; | 117 color_space)]; |
119 } | 118 } |
120 | 119 |
121 [image setSize:NSMakeSize(image_skia.width(), image_skia.height())]; | 120 [image setSize:NSMakeSize(image_skia.width(), image_skia.height())]; |
122 return [image.release() autorelease]; | 121 return [image.release() autorelease]; |
123 } | 122 } |
124 | 123 |
125 } // namespace gfx | 124 } // namespace gfx |
OLD | NEW |