Expand pixelref to return SkImageInfo and rowbytes

include/core/SkMallocPixelRef.h

Index: include/core/SkMallocPixelRef.h
diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h
index 2241a513e7ea223ac8ddeac340bf8f73ee92d2ca..63320f44110ed8873aa3f37b1254c412a076a2ae 100644
--- a/include/core/SkMallocPixelRef.h
+++ b/include/core/SkMallocPixelRef.h
@@ -21,18 +21,21 @@ public:
         last owner of this pixelref is gone. If addr is NULL, sk_malloc_throw()
         is called to allocate it.
      */
-    SkMallocPixelRef(void* addr, size_t size, SkColorTable* ctable, bool ownPixels = true);
+    SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rowBytes,

[scroggo, 2013/11/19 18:17:09]

We'll need to make sure we update Android to call the new constructor.

[reed1, 2013/11/20 20:21:36]

The compiler will help :)

+                     SkColorTable* ctable, bool ownPixels);

[scroggo, 2013/11/19 18:17:09]

This problem already existed, but it is strange to be able to pass NULL to addr
(so the SkMallocPixelRef does the allocation) and false to ownPixels (so it
doesn't delete it). Maybe that's a valid use case though? The caller wants
SkMallocPixelRef to perform the allocation, and then they want to hang on to it
via getAddr?

[reed1, 2013/11/20 20:21:36]

I have an assert in the impl, requiring false for that case. I think now we
should perhaps offer two constructors, one explicitly for allocating storage,
and one explicitly for being passed storage. Or some other way to clarify this.

     virtual ~SkMallocPixelRef();
 
     //! Return the allocation size for the pixels
-    size_t getSize() const { return fSize; }
+    size_t computeSize() const {
+        return fInfo.fHeight * fRB;

[scroggo, 2013/11/19 18:17:09]

Instead of (fInfo.fHeight - 1) * fRB + fInfo.fWidth * fInfo.bytesPerPixel()?

[reed1, 2013/11/20 20:21:36]

Good comment. Bitmap has both sizes. Not sure if we need to have both here or
not. I'll survey the callers for this call and see.

+    }
     void* getAddr() const { return fStorage; }
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMallocPixelRef)
 
 protected:
     // overrides from SkPixelRef
-    virtual void* onLockPixels(SkColorTable**);
+    virtual void* onLockPixels(SkImageInfo*, size_t*, SkColorTable**);
     virtual void onUnlockPixels();
 
     SkMallocPixelRef(SkFlattenableReadBuffer& buffer);
@@ -40,8 +43,9 @@ protected:
 
 private:
     void*           fStorage;
-    size_t          fSize;
     SkColorTable*   fCTable;
+    size_t          fRB;

[scroggo, 2013/11/19 18:17:09]

Can these be const?

[reed1, 2013/11/20 20:21:36]

Good idea.

+    SkImageInfo     fInfo;
     bool            fOwnPixels;
 
     typedef SkPixelRef INHERITED;