diff options
| author | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 12:35:55 +0000 |
|---|---|---|
| committer | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 12:35:55 +0000 |
| commit | 566b237aa2b38ecb5bdcde187db4215af154991c (patch) | |
| tree | e2857d8e640f3341ef37241366ace5a369353d1f /ui | |
| parent | 0571e2283aa25db8e27c79caed8b63cc3c8a8baf (diff) | |
| download | chromium_src-566b237aa2b38ecb5bdcde187db4215af154991c.zip chromium_src-566b237aa2b38ecb5bdcde187db4215af154991c.tar.gz chromium_src-566b237aa2b38ecb5bdcde187db4215af154991c.tar.bz2 | |
Use CGImage for conversion to SkBitmap.
This has two advantages: we can convert a CGImage without building an
UIImage first and the convertion can happen on any thread, not just
the main thread.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11362164
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/image/image_skia_util_ios.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/gfx/image/image_skia_util_ios.mm b/ui/gfx/image/image_skia_util_ios.mm index d9888d4..c037e5c 100644 --- a/ui/gfx/image/image_skia_util_ios.mm +++ b/ui/gfx/image/image_skia_util_ios.mm @@ -31,7 +31,9 @@ gfx::ImageSkia ImageSkiaFromUIImage(UIImage* image) { CGSize size = image.size; CGSize desired_size_for_scale = CGSizeMake(size.width * scale, size.height * scale); - SkBitmap bitmap(gfx::UIImageToSkBitmap(image, desired_size_for_scale, false)); + SkBitmap bitmap(gfx::CGImageToSkBitmap(image.CGImage, + desired_size_for_scale, + false)); if (!bitmap.isNull()) image_skia.AddRepresentation(gfx::ImageSkiaRep(bitmap, scale_factor)); return image_skia; |