Make render task targets be just a proxy.

Change-Id: I09548cc22b13bc0b9b5f77cf1f20c1505a529c51
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356760
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Adlai Holler <adlai@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/src/gpu/GrRenderTaskCluster.cpp b/src/gpu/GrRenderTaskCluster.cpp
index 9cf0343..676ec49 100644
--- a/src/gpu/GrRenderTaskCluster.cpp
+++ b/src/gpu/GrRenderTaskCluster.cpp
@@ -13,9 +13,7 @@
 // Uncomment to get lots of logging.
 #define CLUSTER_DEBUGF(...) //SkDebugf(__VA_ARGS__)
 
-static GrSurfaceProxy* first_target(GrRenderTask* task) {
-    return task->target(0).proxy();
-}
+static GrSurfaceProxy* first_target(GrRenderTask* task) { return task->target(0); }
 
 #ifdef SK_DEBUG
 [[maybe_unused]] static SkString describe_task(GrRenderTask* t) {
@@ -74,7 +72,7 @@
         // Tasks with 0 or multiple targets are treated as full barriers
         // for all their targets.
         for (int j = 0; j < task->numTargets(); j++) {
-            lastTaskMap->remove(task->target(0).proxy());
+            lastTaskMap->remove(task->target(0));
         }
         return false;
     }