move readPixels from bitmap -> pixmap

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
 
@@ skipping 26 matching lines @@
     size_t rowBytes() const { return fRowBytes; }
     const void* addr() const { return fPixels; }
     SkColorTable* ctable() const { return fCTable; }
 
     int width() const { return fInfo.width(); }
     int height() const { return fInfo.height(); }
     SkColorType colorType() const { return fInfo.colorType(); }
     SkAlphaType alphaType() const { return fInfo.alphaType(); }
     bool isOpaque() const { return fInfo.isOpaque(); }
 
-    int64_t getSafeSize64() const { return fInfo.getSafeSize64(fRowBytes); }
+    uint64_t getSize64() const { return sk_64_mul(fInfo.height(), fRowBytes); }
+    uint64_t getSafeSize64() const { return fInfo.getSafeSize64(fRowBytes); }
     size_t getSafeSize() const { return fInfo.getSafeSize(fRowBytes); }
 
     const uint32_t* addr32() const {
         SkASSERT(4 == SkColorTypeBytesPerPixel(fInfo.colorType()));
         return reinterpret_cast<const uint32_t*>(fPixels);
     }
 
     const uint16_t* addr16() const {
         SkASSERT(2 == SkColorTypeBytesPerPixel(fInfo.colorType()));
         return reinterpret_cast<const uint16_t*>(fPixels);
@@ skipping 29 matching lines @@
     uint32_t* writable_addr32(int x, int y) const {
         return const_cast<uint32_t*>(this->addr32(x, y));
     }
     uint16_t* writable_addr16(int x, int y) const {
         return const_cast<uint16_t*>(this->addr16(x, y));
     }
     uint8_t* writable_addr8(int x, int y) const {
         return const_cast<uint8_t*>(this->addr8(x, y));
     }
 
+    // copy methods
+
+    bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
+                    int srcX, int srcY) const;
+    bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes) const {
+        return this->readPixels(dstInfo, dstPixels, dstRowBytes, 0, 0);
+    }
+    bool readPixels(const SkPixmap& dst, int srcX, int srcY) const {
+        return this->readPixels(dst.info(), dst.writable_addr(), dst.rowBytes(), srcX, srcY);
+    }
+    bool readPixels(const SkPixmap& dst) const {
+        return this->readPixels(dst.info(), dst.writable_addr(), dst.rowBytes(), 0, 0);
+    }
+
 private:
     const void*     fPixels;
     SkColorTable*   fCTable;
     size_t          fRowBytes;
     SkImageInfo     fInfo;
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 class SkAutoPixmapUnlock : ::SkNoncopyable {
@@ skipping 36 matching lines @@
 private:
     void        (*fUnlockProc)(void*);
     void*       fUnlockContext;
     SkPixmap    fPixmap;
     bool        fIsLocked;
 
     friend class SkBitmap;
 };
 
 #endif