| Index: ui/gfx/image/image_skia.h
|
| diff --git a/ui/gfx/image/image_skia.h b/ui/gfx/image/image_skia.h
|
| index 259a71e1b246470ecab115f4214ec3778196b60e..24422d2f09a5559c1f28a53532925a83daa35130 100644
|
| --- a/ui/gfx/image/image_skia.h
|
| +++ b/ui/gfx/image/image_skia.h
|
| @@ -97,9 +97,6 @@ class UI_EXPORT ImageSkia {
|
| std::vector<ImageSkiaRep> GetRepresentations() const;
|
| #endif // OS_MACOSX
|
|
|
| - // Returns true if object is null or its size is empty.
|
| - bool empty() const;
|
| -
|
| // Returns true if this is a null object.
|
| // TODO(pkotwicz): Merge this function into empty().
|
| bool isNull() const { return storage_ == NULL; }
|
| @@ -109,11 +106,6 @@ class UI_EXPORT ImageSkia {
|
| int height() const;
|
| gfx::Size size() const;
|
|
|
| - // Wrapper function for SkBitmap::extractBitmap.
|
| - // Deprecated, use ImageSkiaOperations::ExtractSubset instead.
|
| - // TODO(pkotwicz): Remove this function.
|
| - bool extractSubset(ImageSkia* dst, const SkIRect& subset) const;
|
| -
|
| // Returns pointer to 1x bitmap contained by this object. If there is no 1x
|
| // bitmap, the bitmap whose scale factor is closest to 1x is returned.
|
| // This function should only be used in unittests and on platforms which do
|
|
|