| Index: ui/gfx/image/image.h
|
| diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h
|
| index 68e7a23ee619429611da281b3a471304d27f7f80..6f0e9266e7b8a017f94ccda3e4e94fdc12960ec4 100644
|
| --- a/ui/gfx/image/image.h
|
| +++ b/ui/gfx/image/image.h
|
| @@ -44,10 +44,6 @@ struct ImagePNGRep;
|
| class ImageSkia;
|
| class Size;
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| -class CairoCachedSurface;
|
| -#endif
|
| -
|
| namespace internal {
|
| class ImageRep;
|
| class ImageStorage;
|
| @@ -77,10 +73,7 @@ class GFX_EXPORT Image {
|
| // representation.
|
| explicit Image(const ImageSkia& image);
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| - // Does not increase |pixbuf|'s reference count; expects to take ownership.
|
| - explicit Image(GdkPixbuf* pixbuf);
|
| -#elif defined(OS_IOS)
|
| +#if defined(OS_IOS)
|
| // Does not retain |image|; expects to take ownership.
|
| explicit Image(UIImage* image);
|
| #elif defined(OS_MACOSX)
|
| @@ -122,10 +115,7 @@ class GFX_EXPORT Image {
|
| // the Image. Must only be called if IsEmpty() is false.
|
| const SkBitmap* ToSkBitmap() const;
|
| const ImageSkia* ToImageSkia() const;
|
| -#if defined(TOOLKIT_GTK)
|
| - GdkPixbuf* ToGdkPixbuf() const;
|
| - CairoCachedSurface* const ToCairo() const;
|
| -#elif defined(OS_IOS)
|
| +#if defined(OS_IOS)
|
| UIImage* ToUIImage() const;
|
| #elif defined(OS_MACOSX)
|
| NSImage* ToNSImage() const;
|
| @@ -158,9 +148,7 @@ class GFX_EXPORT Image {
|
| scoped_refptr<base::RefCountedMemory> Copy1xPNGBytes() const;
|
| ImageSkia* CopyImageSkia() const;
|
| SkBitmap* CopySkBitmap() const;
|
| -#if defined(TOOLKIT_GTK)
|
| - GdkPixbuf* CopyGdkPixbuf() const;
|
| -#elif defined(OS_IOS)
|
| +#if defined(OS_IOS)
|
| UIImage* CopyUIImage() const;
|
| #elif defined(OS_MACOSX)
|
| NSImage* CopyNSImage() const;
|
|
|