commit 995b4bddd9a1eef933b0acb3ff03c98e7864a8f9
author reed <reed@google.com> Mon Sep 14 10:27:57 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Sep 14 10:27:57 2015 -0700
tree 60b0e5fb83727fc746305cf76c48891be8ab80b9
parent a22eabedef0cc1256f8c60e58e7a1cbd0bd1db9b

be sure to use cached bitmap when we need to upload something to make a texture

BUG=skia:4334

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

src/core/SkBitmapCache.cpp

diff --git a/src/core/SkBitmapCache.cpp b/src/core/SkBitmapCache.cpp
index 9f985e5..dfa387b 100644
--- a/src/core/SkBitmapCache.cpp
+++ b/src/core/SkBitmapCache.cpp
@@ -58,6 +58,11 @@
                    sizeof(fGenID) + sizeof(fWidth) + sizeof(fHeight) + sizeof(fBounds));
     }
 
+    void dump() const {
+        SkDebugf("-- add [%d %d] %d [%d %d %d %d]\n", fWidth, fHeight, fGenID,
+                 fBounds.x(), fBounds.y(), fBounds.width(), fBounds.height());
+    }
+
     const uint32_t  fGenID;
     const int       fWidth;
     const int       fHeight;
@@ -69,7 +74,11 @@
               const SkBitmap& result)
         : fKey(genID, width, height, bounds)
         , fBitmap(result)
-    {}
+    {
+#ifdef TRACE_NEW_BITMAP_CACHE_RECS
+        fKey.dump();
+#endif
+    }
 
     const Key& getKey() const override { return fKey; }
     size_t bytesUsed() const override { return sizeof(fKey) + fBitmap.getSize(); }