commit b9ab5631703c258f1aae7a3ca1bb4b6596b5b42c
author bsalomon <bsalomon@google.com> Tue Oct 07 05:19:24 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 07 05:19:24 2014 -0700
tree fbd252023e73b36f7dd5085025abf4b2cc7d1a58
parent b1b2085569dd0587619c2c7c8a7c4b1ce6c59761

Don't readback and reupload texture-backed bitmaps

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

src/gpu/SkGr.cpp

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index e81abdb..262d339 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -372,7 +372,10 @@
 GrTexture* GrLockAndRefCachedBitmapTexture(GrContext* ctx,
                                            const SkBitmap& bitmap,
                                            const GrTextureParams* params) {
-    GrTexture* result = NULL;
+    GrTexture* result = bitmap.getTexture();
+    if (result) {
+        return SkRef(result);
+    }
 
     bool cache = !bitmap.isVolatile();
 
@@ -400,7 +403,9 @@
 void GrUnlockAndUnrefCachedBitmapTexture(GrTexture* texture) {
     SkASSERT(texture->getContext());
 
-    texture->getContext()->unlockScratchTexture(texture);
+    if (texture->getCacheEntry()) {
+        texture->getContext()->unlockScratchTexture(texture);
+    }
     texture->unref();
 }