Use GrSurfaceContext::read/write-Pixels more

Change-Id: I04bcaf91aa7a43e0563e332c1fe2836d762a04d4
Reviewed-on: https://skia-review.googlesource.com/7520
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

2 files changed, 11 insertions, 10 deletions

diff --git a/src/gpu/GrContextPriv.h b/src/gpu/GrContextPriv.h
index 3315c94e91..ed9691c656 100644
--- a/src/gpu/GrContextPriv.h
+++ b/src/gpu/GrContextPriv.h
@@ -35,6 +35,12 @@ public:
                                                        SkBackingFit dstFit,
                                                        SkBudgeted isDstBudgeted);
 
+    // TODO: add:
+    // sk_sp<GrSurfaceContext> makeBackendSurfaceContext(const GrBackendTextureDesc& desc,
+    //                                                   sk_sp<SkColorSpace> colorSpace,
+    //                                                   GrWrapOwnership = kBorrow_GrWrapOwnership);
+    // Maybe add a 'surfaceProps' param that is ignored for non-RTs?
+
     sk_sp<GrRenderTargetContext> makeBackendTextureRenderTargetContext(
                                                          const GrBackendTextureDesc& desc,
                                                          sk_sp<SkColorSpace> colorSpace,
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index 48fc401b4e..4cf4611f91 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -196,25 +196,20 @@ sk_sp<GrSurfaceProxy> GrSurfaceProxy::Copy(GrContext* context,
     return sk_ref_sp(dstContext->asDeferredSurface());
 }
 
-sk_sp<GrSurfaceProxy> GrSurfaceProxy::TestCopy(GrContext* context, const GrSurfaceDesc& dstDesc,
-                                               GrTexture* srcTexture, SkBudgeted budgeted) {
+sk_sp<GrSurfaceContext> GrSurfaceProxy::TestCopy(GrContext* context, const GrSurfaceDesc& dstDesc,
+                                                 GrSurfaceProxy* srcProxy) {
 
     sk_sp<GrSurfaceContext> dstContext(context->contextPriv().makeDeferredSurfaceContext(
                                                                             dstDesc,
                                                                             SkBackingFit::kExact,
-                                                                            budgeted));
+                                                                            SkBudgeted::kYes));
     if (!dstContext) {
         return nullptr;
     }
 
-    sk_sp<GrSurfaceProxy> srcProxy(GrSurfaceProxy::MakeWrapped(sk_ref_sp(srcTexture)));
-    if (!srcProxy) {
+    if (!dstContext->copy(srcProxy)) {
         return nullptr;
     }
 
-    if (!dstContext->copy(srcProxy.get())) {
-        return nullptr;
-    }
-
-    return sk_ref_sp(dstContext->asDeferredSurface());
+    return dstContext;
 }