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

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

Issue 10834382: mac: Remove implicit conversion from ImageSkia to SkBitmap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 #ifndef UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_ 5 #ifndef UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_
6 #define UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_ 6 #define UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_
7 7
8 #include "ui/base/ui_export.h" 8 #include "ui/base/ui_export.h"
9 9
10 #ifdef __LP64__ 10 #ifdef __LP64__
(...skipping 19 matching lines...) Expand all
30 UI_EXPORT gfx::ImageSkia ImageSkiaFromResizedNSImage(NSImage* image, 30 UI_EXPORT gfx::ImageSkia ImageSkiaFromResizedNSImage(NSImage* image,
31 NSSize size); 31 NSSize size);
32 32
33 // Resizes |[NSImage imageNamed:@NSApplicationIcon]| to have edge width of 33 // Resizes |[NSImage imageNamed:@NSApplicationIcon]| to have edge width of
34 // |size| DIP and returns result as ImageSkia. 34 // |size| DIP and returns result as ImageSkia.
35 UI_EXPORT gfx::ImageSkia ApplicationIconAtSize(int size); 35 UI_EXPORT gfx::ImageSkia ApplicationIconAtSize(int size);
36 36
37 // Converts to NSImage from ImageSkia. 37 // Converts to NSImage from ImageSkia.
38 UI_EXPORT NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia); 38 UI_EXPORT NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia);
39 39
40 // Converts to NSImage from given ImageSkia and a color space.
41 UI_EXPORT NSImage* NSImageFromImageSkiaWithColorSpace(
42 const gfx::ImageSkia& image_skia,
43 CGColorSpaceRef color_space);
44
40 } // namespace gfx 45 } // namespace gfx
41 46
42 #endif // UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_ 47 #endif // UI_GFX_IMAGE_IMAGE_SKIA_UTIL_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698