| Index: include/core/SkPixmap.h
|
| diff --git a/include/core/SkPixmap.h b/include/core/SkPixmap.h
|
| index da97025cab03ae032dd3a7750607143c3fe5e9b9..523c40f294db0b1e5c69b234748dcd4f3340bdab 100644
|
| --- a/include/core/SkPixmap.h
|
| +++ b/include/core/SkPixmap.h
|
| @@ -13,6 +13,7 @@
|
| #include "SkImageInfo.h"
|
|
|
| class SkColorTable;
|
| +class SkData;
|
| struct SkMask;
|
|
|
| /**
|
| @@ -184,6 +185,12 @@ public:
|
| */
|
| void alloc(const SkImageInfo&);
|
|
|
| + /**
|
| + * Returns an SkData object wrapping the allocated pixels memory, and resets the pixmap.
|
| + * If the storage hasn't been allocated, the result is NULL.
|
| + */
|
| + const SkData* SK_WARN_UNUSED_RESULT detachPixelsAsData();
|
| +
|
| // We wrap these so we can clear our internal storage
|
|
|
| void reset() {
|
| @@ -208,7 +215,7 @@ private:
|
|
|
| void freeStorage() {
|
| sk_free(fStorage);
|
| - fStorage = NULL;
|
| + fStorage = nullptr;
|
| }
|
|
|
| typedef SkPixmap INHERITED;
|
|
|