Add SkAutoPixmapStorage::detachPixelsAsData()

include/core/SkPixmap.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPixmap_DEFINED
 #define SkPixmap_DEFINED
 
 #include "SkColor.h"
 #include "SkFilterQuality.h"
 #include "SkImageInfo.h"
 
 class SkColorTable;
+class SkData;
 struct SkMask;
 
 /**
  *  Pairs SkImageInfo with actual pixels and rowbytes. This class does not try to manage the
  *  lifetime of the pixel memory (nor the colortable if provided).
  */
 class SK_API SkPixmap {
 public:
     SkPixmap()
         : fPixels(NULL), fCTable(NULL), fRowBytes(0), fInfo(SkImageInfo::MakeUnknown(0, 0))
@@ skipping 151 matching lines @@
 
     /**
      *  Allocate memory for the pixels needed to match the specified Info and fill out the pixmap
      *  to point to that memory. The storage will be freed when this object is destroyed,
      *  or if another call to tryAlloc() or alloc() is made.
      *
      *  If the memory cannot be allocated, calls sk_throw().
      */
     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() {
         this->freeStorage();
         this->INHERITED::reset();
     }
     void reset(const SkImageInfo& info, const void* addr, size_t rb, SkColorTable* ctable = NULL) {
         this->freeStorage();
         this->INHERITED::reset(info, addr, rb, ctable);
     }
     void reset(const SkImageInfo& info) {
         this->freeStorage();
         this->INHERITED::reset(info);
     }
     bool SK_WARN_UNUSED_RESULT reset(const SkMask& mask) {
         this->freeStorage();
         return this->INHERITED::reset(mask);
     }
 
 private:
     void*   fStorage;
 
     void freeStorage() {
         sk_free(fStorage);
-        fStorage = NULL;
+        fStorage = nullptr;
     }
 
     typedef SkPixmap INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 class SK_API SkAutoPixmapUnlock : ::SkNoncopyable {
 public:
     SkAutoPixmapUnlock() : fUnlockProc(NULL), fIsLocked(false) {}
@@ skipping 34 matching lines @@
 private:
     void        (*fUnlockProc)(void*);
     void*       fUnlockContext;
     SkPixmap    fPixmap;
     bool        fIsLocked;
 
     friend class SkBitmap;
 };
 
 #endif