diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 06:03:33 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 06:03:33 +0000 |
| commit | 8cd838ae195bf9718fd6eb08d5febc9464aadb44 (patch) | |
| tree | 57d517e17bef1d9daa757ecae3590a8d32936e93 | |
| parent | 56eab2f216ce86217149753a407f981cb6d5de6c (diff) | |
| download | chromium_src-8cd838ae195bf9718fd6eb08d5febc9464aadb44.zip chromium_src-8cd838ae195bf9718fd6eb08d5febc9464aadb44.tar.gz chromium_src-8cd838ae195bf9718fd6eb08d5febc9464aadb44.tar.bz2 | |
Toward an android build of sync_unit_tests: OWNERS=rsesek
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9288043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119379 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/image/image.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc index afd9468..9bc7117 100644 --- a/ui/gfx/image/image.cc +++ b/ui/gfx/image/image.cc @@ -408,19 +408,20 @@ internal::ImageRep* Image::GetRepresentation( // Handle Skia-to-native conversions. if (default_rep->type() == Image::kImageRepSkia) { - internal::ImageRepSkia* skia_rep = default_rep->AsImageRepSkia(); internal::ImageRep* native_rep = NULL; #if defined(USE_AURA) static_cast<void>(skia_rep); NOTIMPLEMENTED(); #elif defined(TOOLKIT_USES_GTK) if (rep_type == Image::kImageRepGdk) { - GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(skia_rep->bitmap()); + GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap( + default_rep->AsImageRepSkia()->bitmap()); native_rep = new internal::ImageRepGdk(pixbuf); } #elif defined(OS_MACOSX) if (rep_type == Image::kImageRepCocoa) { - NSImage* image = gfx::SkBitmapsToNSImage(skia_rep->bitmaps()); + NSImage* image = gfx::SkBitmapsToNSImage( + default_rep->AsImageRepSkia()->bitmaps()); base::mac::NSObjectRetain(image); native_rep = new internal::ImageRepCocoa(image); } |