From b9ab5631703c258f1aae7a3ca1bb4b6596b5b42c Mon Sep 17 00:00:00 2001
From: bsalomon <bsalomon@google.com>
Date: Tue, 7 Oct 2014 05:19:24 -0700
Subject: Don't readback and reupload texture-backed bitmaps

Review URL: https://codereview.chromium.org/635573004
---
 src/gpu/SkGr.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index e81abdbae4..262d339b6c 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -372,7 +372,10 @@ bool GrIsBitmapInCache(const GrContext* ctx,
 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 @@ GrTexture* GrLockAndRefCachedBitmapTexture(GrContext* ctx,
 void GrUnlockAndUnrefCachedBitmapTexture(GrTexture* texture) {
     SkASSERT(texture->getContext());
 
-    texture->getContext()->unlockScratchTexture(texture);
+    if (texture->getCacheEntry()) {
+        texture->getContext()->unlockScratchTexture(texture);
+    }
     texture->unref();
 }
 
-- 
cgit v1.2.3