change offset to xy for pixelref subsetting

include/core/SkBitmap.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkBitmap_DEFINED
 #define SkBitmap_DEFINED
 
@@ skipping 335 matching lines @@
                      the bitmap will be unchanged.
     */
     bool allocPixels(Allocator* allocator, SkColorTable* ctable);
 
     /** Return the current pixelref object, if any
     */
     SkPixelRef* pixelRef() const { return fPixelRef; }
     /** Return the offset into the pixelref, if any. Will return 0 if there is
         no pixelref installed.
     */
-    size_t pixelRefOffset() const { return fPixelRefOffset; }
+//    size_t pixelRefOffset() const { return fPixelRefOffset; }

[scroggo, 2014/01/07 22:11:33]

Any reason not to delete this outright?

[reed1, 2014/01/07 22:37:59]

Done.

+
+    SkIPoint pixelRefOrigin() const { return fPixelRefOrigin; }
+
     /** Assign a pixelref and optional offset. Pixelrefs are reference counted,
         so the existing one (if any) will be unref'd and the new one will be
         ref'd.
     */
-    SkPixelRef* setPixelRef(SkPixelRef* pr, size_t offset = 0);
+    SkPixelRef* setPixelRef(SkPixelRef* pr, int dx, int dy);
+    SkPixelRef* setPixelRef(SkPixelRef* pr) {
+        return this->setPixelRef(pr, 0, 0);
+    }
+    SkPixelRef* setPixelRef(SkPixelRef* pr, const SkIPoint& origin) {
+        return this->setPixelRef(pr, origin.fX, origin.fY);
+    }
 
     /** Call this to ensure that the bitmap points to the current pixel address
         in the pixelref. Balance it with a call to unlockPixels(). These calls
         are harmless if there is no pixelref.
     */
     void lockPixels() const;
     /** When you are finished access the pixel memory, call this to balance a
         previous call to lockPixels(). This allows pixelrefs that implement
         cached/deferred image decoding to know when there are active clients of
         a given image.
@@ skipping 286 matching lines @@
         int       fHeight;
     };
 
     SkDEVCODE(void toString(SkString* str) const;)
 
 private:
     struct MipMap;
     mutable MipMap* fMipMap;
 
     mutable SkPixelRef* fPixelRef;
-    mutable size_t      fPixelRefOffset;
     mutable int         fPixelLockCount;
     // either user-specified (in which case it is not treated as mutable)
     // or a cache of the returned value from fPixelRef->lockPixels()
     mutable void*       fPixels;
     mutable SkColorTable* fColorTable;    // only meaningful for kIndex8
 
+    SkIPoint    fPixelRefOrigin;

[scroggo, 2014/01/07 22:11:33]

Why was the old one mutable, and this one not? (My guess is that it shouldn't be
mutable, but it'd be nice to know why it used to be.)

+
     enum Flags {
         kImageIsOpaque_Flag     = 0x01,
         kImageIsVolatile_Flag   = 0x02,
         kImageIsImmutable_Flag  = 0x04,
 #ifdef SK_BUILD_FOR_ANDROID
         /* A hint for the renderer responsible for drawing this bitmap
          * indicating that it should attempt to use mipmaps when this bitmap
          * is drawn scaled down.
          */
         kHasHardwareMipMap_Flag = 0x08,
@@ skipping 139 matching lines @@
 
 inline SkPMColor SkBitmap::getIndex8Color(int x, int y) const {
     SkASSERT(fPixels);
     SkASSERT(fConfig == kIndex8_Config);
     SkASSERT((unsigned)x < fWidth && (unsigned)y < fHeight);
     SkASSERT(fColorTable);
     return (*fColorTable)[*((const uint8_t*)fPixels + y * fRowBytes + x)];
 }
 
 #endif