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> |
| 11 #include <stddef.h> |
11 | 12 |
12 #include "base/mac/mac_util.h" | 13 #include "base/mac/mac_util.h" |
13 #include "base/mac/scoped_nsobject.h" | 14 #include "base/mac/scoped_nsobject.h" |
14 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
15 #include "skia/ext/skia_utils_mac.h" | 16 #include "skia/ext/skia_utils_mac.h" |
16 #include "third_party/skia/include/core/SkBitmap.h" | 17 #include "third_party/skia/include/core/SkBitmap.h" |
17 #include "ui/gfx/image/image_skia.h" | 18 #include "ui/gfx/image/image_skia.h" |
18 | 19 |
19 namespace { | 20 namespace { |
20 | 21 |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 [image addRepresentation: | 109 [image addRepresentation: |
109 skia::SkBitmapToNSBitmapImageRepWithColorSpace(it->sk_bitmap(), | 110 skia::SkBitmapToNSBitmapImageRepWithColorSpace(it->sk_bitmap(), |
110 color_space)]; | 111 color_space)]; |
111 } | 112 } |
112 | 113 |
113 [image setSize:NSMakeSize(image_skia.width(), image_skia.height())]; | 114 [image setSize:NSMakeSize(image_skia.width(), image_skia.height())]; |
114 return [image.release() autorelease]; | 115 return [image.release() autorelease]; |
115 } | 116 } |
116 | 117 |
117 } // namespace gfx | 118 } // namespace gfx |
OLD | NEW |