diff options
| author | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 22:37:11 +0000 |
|---|---|---|
| committer | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 22:37:11 +0000 |
| commit | e0e8289ce8b13eee37d4063ad505255e9555c372 (patch) | |
| tree | c63b876fdbed368d06fc024822aef19c409720d5 /skia/ext/skia_utils_mac.mm | |
| parent | e432d4cbdf610a02ed7aea0bf181e4a47df5dad7 (diff) | |
| download | chromium_src-e0e8289ce8b13eee37d4063ad505255e9555c372.zip chromium_src-e0e8289ce8b13eee37d4063ad505255e9555c372.tar.gz chromium_src-e0e8289ce8b13eee37d4063ad505255e9555c372.tar.bz2 | |
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
Diffstat (limited to 'skia/ext/skia_utils_mac.mm')
| -rw-r--r-- | skia/ext/skia_utils_mac.mm | 1 |
1 files changed, 1 insertions, 0 deletions
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; } |