Revert of Don't readback and reupload texture-backed bitmaps

src/gpu/SkGr.cpp

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