Revert "Make sure to visit clips and dst proxies during gather"

This reverts commit b9d98e36865796824dd2f839646f029cfa9ce4b5.

Reason for revert: Assertion failure on a lot of bots

Original change's description:
> Make sure to visit clips and dst proxies during gather
> 
> Bug: skia:7190
> Change-Id: I72b40743439a33f51b94592fa81cd6146f8e92c6
> Reviewed-on: https://skia-review.googlesource.com/74080
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

TBR=robertphillips@google.com,csmartdalton@google.com

Change-Id: I980266a838b8e29bf0859e30a50986b05ed811b8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7190
Reviewed-on: https://skia-review.googlesource.com/76340
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

1 files changed, 4 insertions, 10 deletions

diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index 61e8e7d332..4bdfe589bb 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -274,16 +274,10 @@ void GrRenderTargetOpList::gatherProxyIntervals(GrResourceAllocator* alloc) cons
     auto gather = [ alloc ] (GrSurfaceProxy* p) {
         alloc->addInterval(p);
     };
-    for (const RecordedOp& recordedOp : fRecordedOps) {
-        // only diffs from the GrTextureOpList version
-        if (recordedOp.fOp) {
-            recordedOp.fOp->visitProxies(gather);
-        }
-        if (recordedOp.fDstProxy.proxy()) {
-            gather(recordedOp.fDstProxy.proxy());
-        }
-        if (recordedOp.fAppliedClip) {
-            recordedOp.fAppliedClip->visitProxies(gather);
+    for (int i = 0; i < fRecordedOps.count(); ++i) {
+        const GrOp* op = fRecordedOps[i].fOp.get(); // only diff from the GrTextureOpList version
+        if (op) {
+            op->visitProxies(gather);
         }
 
         // Even though the op may have been moved we still need to increment the op count to