| Index: src/core/SkBitmapController.h
|
| diff --git a/src/core/SkBitmapController.h b/src/core/SkBitmapController.h
|
| index e6c4443872eaf0faddee6f8b8e1a9f0d206bb3bc..32e73e813d33f01f84406ea70d27b9949e011c12 100644
|
| --- a/src/core/SkBitmapController.h
|
| +++ b/src/core/SkBitmapController.h
|
| @@ -11,37 +11,9 @@
|
| #include "SkBitmap.h"
|
| #include "SkBitmapCache.h"
|
| #include "SkFilterQuality.h"
|
| -#include "SkImage.h"
|
| #include "SkMatrix.h"
|
|
|
| -class SkBitmapProvider {
|
| -public:
|
| - explicit SkBitmapProvider(const SkBitmap& bm) : fBitmap(bm) {}
|
| - explicit SkBitmapProvider(const SkImage* img) : fImage(SkSafeRef(img)) {}
|
| - SkBitmapProvider(const SkBitmapProvider& other)
|
| - : fBitmap(other.fBitmap)
|
| - , fImage(SkSafeRef(other.fImage.get()))
|
| - {}
|
| -
|
| - int width() const;
|
| - int height() const;
|
| - uint32_t getID() const;
|
| -
|
| - bool validForDrawing() const;
|
| - SkImageInfo info() const;
|
| -
|
| - SkBitmapCacheDesc makeCacheDesc(int w, int h) const;
|
| - SkBitmapCacheDesc makeCacheDesc() const;
|
| - void notifyAddedToCache() const;
|
| -
|
| - // Only call this if you're sure you need the bits, since it make be expensive
|
| - // ... cause a decode and cache, or gpu-readback
|
| - bool asBitmap(SkBitmap*) const;
|
| -
|
| -private:
|
| - SkBitmap fBitmap;
|
| - SkAutoTUnref<const SkImage> fImage;
|
| -};
|
| +class SkBitmapProvider;
|
|
|
| /**
|
| * Handles request to scale, filter, and lock a bitmap to be rasterized.
|
|
|