Start using RenderTargetProxy (omnibus)

src/gpu/batches/GrClearStencilClipBatch.h

Index: src/gpu/batches/GrClearStencilClipBatch.h
diff --git a/src/gpu/batches/GrClearStencilClipBatch.h b/src/gpu/batches/GrClearStencilClipBatch.h
index 42d7c444db12cce94707596a8185cfd3d2ca9432..7cdc94976cd5a81d0137f19ba16c98e7422e7dab 100644
--- a/src/gpu/batches/GrClearStencilClipBatch.h
+++ b/src/gpu/batches/GrClearStencilClipBatch.h
@@ -19,20 +19,20 @@ class GrClearStencilClipBatch final : public GrBatch {
 public:
     DEFINE_BATCH_CLASS_ID
 
-    GrClearStencilClipBatch(const GrFixedClip& clip, bool insideStencilMask, GrRenderTarget* rt)
+    GrClearStencilClipBatch(const GrFixedClip& clip, bool insideStencilMask, GrRenderTargetProxy* rtp)
         : INHERITED(ClassID())
         , fClip(clip)
         , fInsideStencilMask(insideStencilMask)
-        , fRenderTarget(rt) {
+        , fRenderTargetProxy(rtp) {
         const SkRect& bounds = fClip.scissorEnabled() ? SkRect::Make(fClip.scissorRect())
-                                                      : SkRect::MakeIWH(rt->width(), rt->height());
+                                                      : SkRect::MakeIWH(rtp->width(), rtp->height());
         this->setBounds(bounds, HasAABloat::kNo, IsZeroArea::kNo);
     }
 
     const char* name() const override { return "ClearStencilClip"; }
 
-    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("Scissor [");
@@ -40,7 +40,7 @@ public:
             const SkIRect& r = fClip.scissorRect();
             string.appendf("L: %d, T: %d, R: %d, B: %d", r.fLeft, r.fTop, r.fRight, r.fBottom);
         }
-        string.appendf("], IC: %d, RT: %d", fInsideStencilMask, fRenderTarget.get()->uniqueID());
+        string.appendf("], IC: %d, RT: %d", fInsideStencilMask, fRenderTargetProxy.get()->uniqueID());
         string.append(INHERITED::dumpInfo());
         return string;
     }
@@ -56,7 +56,7 @@ private:
 
     const GrFixedClip                                       fClip;
     const bool                                              fInsideStencilMask;
-    GrPendingIOResource<GrRenderTarget, kWrite_GrIOType>    fRenderTarget;
+    GrPendingIOResource<GrRenderTargetProxy, kWrite_GrIOType>    fRenderTargetProxy;
 
     typedef GrBatch INHERITED;
 };