Fixed bad bitmap size crashes

include/core/SkMallocPixelRef.h

Index: include/core/SkMallocPixelRef.h
diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h
index 2241a513e7ea223ac8ddeac340bf8f73ee92d2ca..100a15d90abb4ca55b30aa9af47e5ce17f18fa67 100644
--- a/include/core/SkMallocPixelRef.h
+++ b/include/core/SkMallocPixelRef.h
@@ -24,8 +24,6 @@ public:
     SkMallocPixelRef(void* addr, size_t size, SkColorTable* ctable, bool ownPixels = true);
     virtual ~SkMallocPixelRef();
 
-    //! Return the allocation size for the pixels
-    size_t getSize() const { return fSize; }
     void* getAddr() const { return fStorage; }
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMallocPixelRef)
@@ -38,6 +36,9 @@ protected:
     SkMallocPixelRef(SkFlattenableReadBuffer& buffer);
     virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
 
+    // Returns the allocation size for the pixels
+    virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE { return fSize; }

[sugoi, 2013/12/04 16:20:31]

I moved and renamed this function and it's still compiling, so I'm fairly
certain that the original one was unused (I double checked in chromium code
search, and there's no call site for this SkMallocPixelRef::getSize).

+
 private:
     void*           fStorage;
     size_t          fSize;