Start using RenderTargetProxy (omnibus)

src/gpu/batches/GrDiscardBatch.h

Index: src/gpu/batches/GrDiscardBatch.h
diff --git a/src/gpu/batches/GrDiscardBatch.h b/src/gpu/batches/GrDiscardBatch.h
index 8a3be0e5f381914f2b62fe1fbc62b3343030f94d..bde71b824678a4ebc1450d2ea82310d360c0c136 100644
--- a/src/gpu/batches/GrDiscardBatch.h
+++ b/src/gpu/batches/GrDiscardBatch.h
@@ -17,21 +17,21 @@ class GrDiscardBatch final : public GrBatch {
 public:
     DEFINE_BATCH_CLASS_ID
 
-    GrDiscardBatch(GrRenderTarget* rt)
+    GrDiscardBatch(GrRenderTargetProxy* rtp)
         : INHERITED(ClassID())
-        , fRenderTarget(rt) {
-        this->setBounds(SkRect::MakeIWH(rt->width(), rt->height()), HasAABloat::kNo,
+        , fRenderTargetProxy(rtp) {
+        this->setBounds(SkRect::MakeIWH(rtp->width(), rtp->height()), HasAABloat::kNo,
                         IsZeroArea::kNo);
     }
 
     const char* name() const override { return "Discard"; }
 
-    uint32_t renderTargetUniqueID() const override { return fRenderTarget.get()->uniqueID(); }
-    GrRenderTarget* renderTarget() const override { return fRenderTarget.get(); }
+    uint32_t renderTargetUniqueID() const override { return fRenderTargetProxy.get()->uniqueID(); }
+    GrRenderTargetProxy* rtp() const override { return fRenderTargetProxy.get(); }
 
     SkString dumpInfo() const override {
         SkString string;
-        string.printf("RT: %d", fRenderTarget.get()->uniqueID());
+        string.printf("RT: %d", fRenderTargetProxy.get()->uniqueID());
         string.append(INHERITED::dumpInfo());
         return string;
     }
@@ -47,7 +47,7 @@ private:
         state->commandBuffer()->discard();
     }
 
-    GrPendingIOResource<GrRenderTarget, kWrite_GrIOType> fRenderTarget;
+    GrPendingIOResource<GrRenderTargetProxy, kWrite_GrIOType> fRenderTargetProxy;
 
     typedef GrBatch INHERITED;
 };