From e0e8289ce8b13eee37d4063ad505255e9555c372 Mon Sep 17 00:00:00 2001 From: "pamg@google.com" Date: Wed, 4 Nov 2009 22:37:11 +0000 Subject: Restoring r29827. The skia file is new to this attempt, and may be what was causing a unit test to crash last time. Refactor security-icon code to a more general form, also more consistent with the Windows implementation, in preparation for implementing page actions. Review URL: http://codereview.chromium.org/264037 BUG=14899, 22922, 12281 TEST=unit tests included Review URL: http://codereview.chromium.org/348069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31023 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/ext/skia_utils_mac.mm | 1 + 1 file changed, 1 insertion(+) (limited to 'skia/ext/skia_utils_mac.mm') diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index 7d0c23c..0a08c75 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -177,6 +177,7 @@ NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) { CFRelease(cgimage); NSImage* image = [[[NSImage alloc] init] autorelease]; [image addRepresentation:bitmap]; + [image setSize:NSMakeSize(skiaBitmap.width(), skiaBitmap.height())]; return image; } -- cgit v1.1