diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 14:23:41 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 14:23:41 +0000 |
| commit | a4ae3e1139fb2cf09a9c5dc95baec927b47ab770 (patch) | |
| tree | 732e449f1e510c1eab2d7e8802db97c4d632324a /skia/ext/skia_utils_mac.mm | |
| parent | ef8ca82edcb77b5c78fbe8c3a87338713ad72890 (diff) | |
| download | chromium_src-a4ae3e1139fb2cf09a9c5dc95baec927b47ab770.zip chromium_src-a4ae3e1139fb2cf09a9c5dc95baec927b47ab770.tar.gz chromium_src-a4ae3e1139fb2cf09a9c5dc95baec927b47ab770.tar.bz2 | |
Reverting r19244 as it unintentionally broke ui tests: OtherRedirectsDontForkProcess InEmptyFrame TestLifetimeOfDomAutomationController
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/skia_utils_mac.mm')
| -rw-r--r-- | skia/ext/skia_utils_mac.mm | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index cdf49cc..463fd52 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -10,8 +10,6 @@ #include "base/scoped_cftyperef.h" #include "base/scoped_ptr.h" #include "skia/ext/bitmap_platform_device_mac.h" -#include "third_party/skia/include/utils/mac/SkCGUtils.h" -#include "third_party/skia/include/core/SkColorPriv.h" namespace gfx { @@ -167,17 +165,4 @@ SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque) { return bitmap; } -NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) { - // First convert SkBitmap to CGImageRef. - CGImageRef cgimage = SkCreateCGImageRef(skiaBitmap); - - // Now convert to NSImage. - NSBitmapImageRep* bitmap = [[[NSBitmapImageRep alloc] - initWithCGImage:cgimage] autorelease]; - CFRelease(cgimage); - NSImage* image = [[[NSImage alloc] init] autorelease]; - [image addRepresentation:bitmap]; - return image; -} - } // namespace gfx |