commit 04617139f7f715bdc05a32a58e65e3c208bccff4
author reed <reed@google.com> Thu Aug 21 09:46:49 2014 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 21 09:46:49 2014 -0700
tree 4f2d890e90af537711177fab497741fc98848c8a
parent 53fecfb15d254397ab03032b888daa9d15c487b6

expose generalized imagecache key

BUG=skia:
R=mtklein@google.com, halcanary@google.com, qiankun.miao@intel.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/483493003

src/lazy/SkCachingPixelRef.cpp

diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp
index 97503e5..c596828 100644
--- a/src/lazy/SkCachingPixelRef.cpp
+++ b/src/lazy/SkCachingPixelRef.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "SkCachingPixelRef.h"
-#include "SkScaledImageCache.h"
+#include "SkBitmapCache.h"
 
 bool SkCachingPixelRef::Install(SkImageGenerator* generator,
                                 SkBitmap* dst) {
@@ -48,10 +48,8 @@
     const SkImageInfo& info = this->info();
     SkBitmap bitmap;
     SkASSERT(NULL == fScaledCacheId);
-    fScaledCacheId = SkScaledImageCache::FindAndLock(this->getGenerationID(),
-                                                     info.fWidth,
-                                                     info.fHeight,
-                                                     &bitmap);
+    fScaledCacheId = SkBitmapCache::FindAndLock(this->getGenerationID(), info.fWidth, info.fHeight,
+                                                &bitmap);
     if (NULL == fScaledCacheId) {
         // Cache has been purged, must re-decode.
         if (!bitmap.allocPixels(info, fRowBytes)) {
@@ -63,10 +61,8 @@
             fErrorInDecoding = true;
             return false;
         }
-        fScaledCacheId = SkScaledImageCache::AddAndLock(this->getGenerationID(),
-                                                        info.fWidth,
-                                                        info.fHeight,
-                                                        bitmap);
+        fScaledCacheId = SkBitmapCache::AddAndLock(this->getGenerationID(),
+                                                   info.fWidth, info.fHeight, bitmap);
         SkASSERT(fScaledCacheId != NULL);
     }