diff options
| author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 06:37:11 +0000 |
|---|---|---|
| committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 06:37:11 +0000 |
| commit | b4237b004e1bc9f362085286fdc4b726efc41b80 (patch) | |
| tree | ae94e167e41c56711c04a579f2d97e095f00db1b /ui/gfx/image | |
| parent | 499c5ccc4bc0bd850c2301686112bf0617724f56 (diff) | |
| download | chromium_src-b4237b004e1bc9f362085286fdc4b726efc41b80.zip chromium_src-b4237b004e1bc9f362085286fdc4b726efc41b80.tar.gz chromium_src-b4237b004e1bc9f362085286fdc4b726efc41b80.tar.bz2 | |
Revert 119379 - Toward an android build of sync_unit_tests: OWNERS=rsesek
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9288043
TBR=jrg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9225014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/image')
| -rw-r--r-- | ui/gfx/image/image.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc index 9bc7117..afd9468 100644 --- a/ui/gfx/image/image.cc +++ b/ui/gfx/image/image.cc @@ -408,20 +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( - default_rep->AsImageRepSkia()->bitmap()); + GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(skia_rep->bitmap()); native_rep = new internal::ImageRepGdk(pixbuf); } #elif defined(OS_MACOSX) if (rep_type == Image::kImageRepCocoa) { - NSImage* image = gfx::SkBitmapsToNSImage( - default_rep->AsImageRepSkia()->bitmaps()); + NSImage* image = gfx::SkBitmapsToNSImage(skia_rep->bitmaps()); base::mac::NSObjectRetain(image); native_rep = new internal::ImageRepCocoa(image); } |