change offset to xy for pixelref subsetting

src/core/SkBitmapHeap.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapHeap.h"
 
@@ skipping 17 matching lines @@
         // will be the only one able to modify it, so it does not
         // need to be an atomic operation.
         fRefCount = count;
     } else {
         sk_atomic_add(&fRefCount, count);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+static bool operator<(const SkIPoint& a, const SkIPoint& b) {
+    return *(const int64_t*)&a < *(const int64_t*)&b;
+}
+
+static bool operator>(const SkIPoint& a, const SkIPoint& b) {
+    return *(const int64_t*)&a > *(const int64_t*)&b;
+}
+
 bool SkBitmapHeap::LookupEntry::Less(const SkBitmapHeap::LookupEntry& a,
                                      const SkBitmapHeap::LookupEntry& b) {
     if (a.fGenerationId < b.fGenerationId) {
         return true;
     } else if (a.fGenerationId > b.fGenerationId) {
         return false;
-    } else if (a.fPixelOffset < b.fPixelOffset) {
+    } else if (a.fPixelOrigin < b.fPixelOrigin) {
         return true;
-    } else if (a.fPixelOffset > b.fPixelOffset) {
+    } else if (a.fPixelOrigin > b.fPixelOrigin) {
         return false;
     } else if (a.fWidth < b.fWidth) {
         return true;
     } else if (a.fWidth > b.fWidth) {
         return false;
     } else if (a.fHeight < b.fHeight) {
         return true;
     }
     return false;
 }
@@ skipping 333 matching lines @@
         for (int i = 0; i < fDeferredEntries.count(); i++) {
             SkASSERT(fOwnerCount != IGNORE_OWNERS);
             SkBitmapHeapEntry* heapEntry = this->getEntry(fDeferredEntries[i]);
             SkASSERT(heapEntry != NULL);
             heapEntry->addReferences(fOwnerCount);
         }
     }
     fDeferAddingOwners = false;
     fDeferredEntries.reset();
 }