diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 23:19:24 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 23:19:24 +0000 |
| commit | 4c81a4b25fb0cd3b8ca08c2d8657b16183c70c14 (patch) | |
| tree | d8cc54c389485edba08fe56677e4f9839c8a8a0b /ui/gfx | |
| parent | 4f3ddbe0b094835de3664786885b55bb01c5eb10 (diff) | |
| download | chromium_src-4c81a4b25fb0cd3b8ca08c2d8657b16183c70c14.zip chromium_src-4c81a4b25fb0cd3b8ca08c2d8657b16183c70c14.tar.gz chromium_src-4c81a4b25fb0cd3b8ca08c2d8657b16183c70c14.tar.bz2 | |
Android build fixed. OWNER=rsesek.
Redo of https://chromiumcodereview.appspot.com/9288043 that does not break Aurabots.
BUG=
TEST=
Review URL: http://codereview.chromium.org/9225032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx')
| -rw-r--r-- | ui/gfx/image/image.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc index afd9468..d31e2d8 100644 --- a/ui/gfx/image/image.cc +++ b/ui/gfx/image/image.cc @@ -408,19 +408,19 @@ 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); } |