commit 37c5a815d8ea33247968212ef4cc83394ceee1bc
author reed <reed@google.com> Fri Oct 03 13:23:30 2014 -0700
committer Commit bot <commit-bot@chromium.org> Fri Oct 03 13:23:31 2014 -0700
tree 549847a55767b6deea8428b66068e82b43af13c0
parent 9e96aa07dbf1210fd35ae8e0c54d4d9822544e89

Speculative revert to diagnose crash in chrome. Revert "Add SkCachedData and use it for SkMipMap"

This reverts commit 92561a0b99ad6c08ab7a11dd1872f028199392e9.

crasher in question:
https://code.google.com/p/chromium/issues/detail?id=420178

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

src/core/SkBitmapCache.cpp

diff --git a/src/core/SkBitmapCache.cpp b/src/core/SkBitmapCache.cpp
index c1c5d06..5044d30 100644
--- a/src/core/SkBitmapCache.cpp
+++ b/src/core/SkBitmapCache.cpp
@@ -71,7 +71,7 @@
 };
 
 #define CHECK_LOCAL(localCache, localName, globalName, ...) \
-    ((localCache) ? localCache->localName(__VA_ARGS__) : SkResourceCache::globalName(__VA_ARGS__))
+    (localCache) ? localCache->localName(__VA_ARGS__) : SkResourceCache::globalName(__VA_ARGS__)
 
 bool SkBitmapCache::Find(const SkBitmap& src, SkScalar invScaleX, SkScalar invScaleY, SkBitmap* result,
                          SkResourceCache* localCache) {
@@ -125,17 +125,18 @@
 struct MipMapRec : public SkResourceCache::Rec {
     MipMapRec(const SkBitmap& src, const SkMipMap* result)
         : fKey(src.getGenerationID(), 0, 0, get_bounds_from_bitmap(src))
-        , fMipMap(result)
-    {
-        fMipMap->attachToCacheAndRef();
-    }
+        , fMipMap(SkRef(result))
+    {}
 
     virtual ~MipMapRec() {
-        fMipMap->detachFromCacheAndUnref();
+        fMipMap->unref();
     }
 
+    BitmapKey       fKey;
+    const SkMipMap* fMipMap;
+
     virtual const Key& getKey() const SK_OVERRIDE { return fKey; }
-    virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fMipMap->size(); }
+    virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fMipMap->getSize(); }
 
     static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextMip) {
         const MipMapRec& rec = static_cast<const MipMapRec&>(baseRec);
@@ -145,33 +146,20 @@
         // mipmaps don't use the custom allocator yet, so we don't need to check pixels
         return true;
     }
-
-private:
-    BitmapKey       fKey;
-    const SkMipMap* fMipMap;
 };
 
-const SkMipMap* SkMipMapCache::FindAndRef(const SkBitmap& src, SkResourceCache* localCache) {
+const SkMipMap* SkMipMapCache::FindAndRef(const SkBitmap& src) {
     BitmapKey key(src.getGenerationID(), 0, 0, get_bounds_from_bitmap(src));
     const SkMipMap* result;
-
-    if (!CHECK_LOCAL(localCache, find, Find, key, MipMapRec::Visitor, &result)) {
+    if (!SkResourceCache::Find(key, MipMapRec::Visitor, &result)) {
         result = NULL;
     }
     return result;
 }
 
-static SkResourceCache::DiscardableFactory get_fact(SkResourceCache* localCache) {
-    return localCache ? localCache->GetDiscardableFactory()
-                      : SkResourceCache::GetDiscardableFactory();
-}
-
-const SkMipMap* SkMipMapCache::AddAndRef(const SkBitmap& src, SkResourceCache* localCache) {
-    SkMipMap* mipmap = SkMipMap::Build(src, get_fact(localCache));
-    if (mipmap) {
-        MipMapRec* rec = SkNEW_ARGS(MipMapRec, (src, mipmap));
-        CHECK_LOCAL(localCache, add, Add, rec);
+void SkMipMapCache::Add(const SkBitmap& src, const SkMipMap* result) {
+    if (result) {
+        SkResourceCache::Add(SkNEW_ARGS(MipMapRec, (src, result)));
     }
-    return mipmap;
 }