From 884200ef76bbd25ab31e061a24cc8c8268dacca0 Mon Sep 17 00:00:00 2001
From: reed <reed@google.com>
Date: Mon, 29 Jun 2015 09:00:20 -0700
Subject: [PATCH] remove premature discard optimization

BUG=skia:

Review URL: https://codereview.chromium.org/1212613005
---
 src/image/SkSurface_Gpu.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp
index 34532f7..71bed3a 100644
--- a/src/image/SkSurface_Gpu.cpp
+++ b/src/image/SkSurface_Gpu.cpp
@@ -33,13 +33,11 @@ GrBackendObject SkSurface_Gpu::onGetTextureHandle(TextureHandleAccess access) {
             rt->prepareForExternalRead();   // todo: rename to prepareForExternalAccess()
             break;
         case kFlushWrite_TextureHandleAccess:
+        case kDiscardWrite_TextureHandleAccess:
+            // for now we don't special-case on Discard, but we may in the future.
             this->notifyContentWillChange(kRetain_ContentChangeMode);
             rt->flushWrites();
             break;
-        case kDiscardWrite_TextureHandleAccess:
-            this->notifyContentWillChange(kDiscard_ContentChangeMode);
-            rt->discard();
-            break;
     }
     return rt->asTexture()->getTextureHandle();
 }
-- 
2.7.4