change offset to xy for pixelref subsetting

src/core/SkBitmapHeap.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkBitmapHeap_DEFINED
 #define SkBitmapHeap_DEFINED
 
@@ skipping 202 matching lines @@
      * Resume adding references when duplicate SkBitmaps are inserted.
      * @param add If true, add references to the SkBitmapHeapEntrys whose SkBitmaps were re-inserted
      *            while deferring.
      */
     void endAddingOwnersDeferral(bool add);
 
 private:
     struct LookupEntry {
         LookupEntry(const SkBitmap& bm)
         : fGenerationId(bm.getGenerationID())
-        , fPixelOffset(bm.pixelRefOffset())
+        , fPixelOrigin(bm.pixelRefOrigin())
         , fWidth(bm.width())
         , fHeight(bm.height())
         , fMoreRecentlyUsed(NULL)
         , fLessRecentlyUsed(NULL){}
 
         const uint32_t fGenerationId; // SkPixelRef GenerationID.
-        const size_t   fPixelOffset;
+        const SkIPoint fPixelOrigin;
         const uint32_t fWidth;
         const uint32_t fHeight;
 
         // TODO: Generalize the LRU caching mechanism
         LookupEntry* fMoreRecentlyUsed;
         LookupEntry* fLessRecentlyUsed;
 
         uint32_t fStorageSlot; // slot of corresponding bitmap in fStorage.
 
         /**
@@ skipping 57 matching lines @@
     const int32_t fOwnerCount;
     size_t fBytesAllocated;
 
     bool fDeferAddingOwners;
     SkTDArray<int> fDeferredEntries;
 
     typedef SkBitmapHeapReader INHERITED;
 };
 
 #endif // SkBitmapHeap_DEFINED