diff options
Diffstat (limited to 'chromium/third_party/skia/src/core/SkBitmapHeap.h')
-rw-r--r-- | chromium/third_party/skia/src/core/SkBitmapHeap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/skia/src/core/SkBitmapHeap.h b/chromium/third_party/skia/src/core/SkBitmapHeap.h index 2547eeec74a..56ed3584e81 100644 --- a/chromium/third_party/skia/src/core/SkBitmapHeap.h +++ b/chromium/third_party/skia/src/core/SkBitmapHeap.h @@ -111,7 +111,7 @@ public: */ SkBitmapHeap(ExternalStorage* externalStorage, int32_t heapSize = UNLIMITED_SIZE); - ~SkBitmapHeap(); + virtual ~SkBitmapHeap(); /** * Makes a shallow copy of all bitmaps currently in the heap and returns them as an array. The @@ -220,14 +220,14 @@ 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; |