Rename GrProgramResource to GrGpuResourceRef

include/gpu/GrProgramElement.h

Index: include/gpu/GrProgramElement.h
diff --git a/include/gpu/GrProgramElement.h b/include/gpu/GrProgramElement.h
index 5f88a2a68f79896cf1880692c8f0659c8d702bd6..73ff39bbf649c4f64d33ad6f63a8b84804fc8ec0 100644
--- a/include/gpu/GrProgramElement.h
+++ b/include/gpu/GrProgramElement.h
@@ -11,7 +11,7 @@
 #include "SkRefCnt.h"
 #include "SkTArray.h"
 
-class GrProgramResource;
+class GrGpuResourceRef;
 
 /**
  * Base class for GrEffect (and future GrGeometryProcessor). GrDrawState uses this to manage
@@ -19,8 +19,8 @@ class GrProgramResource;
  * converts resources owned by the effect from being ref'ed to having pending reads/writes.
  *
  * All GrGpuResource objects owned by a GrProgramElement or derived classes (either directly or
- * indirectly) must be wrapped in a GrProgramResource and registered with the GrProgramElement using
- * addGrProgramResource(). This allows the regular refs to be converted to pending IO events
+ * indirectly) must be wrapped in a GrGpuResourceRef and registered with the GrProgramElement using

[robertphillips, 2014/09/17 14:38:38]

This remained addProgramResource.

[bsalomon, 2014/09/17 14:55:03]

Ah, nice catch. Renamed to addGpuResource(), renamed the field to fGpuResources,
and updated the comment.

+ * addGrGpuResourceRef(). This allows the regular refs to be converted to pending IO events
  * when the program element is scheduled for deferred execution.
  */
 class GrProgramElement : public SkNoncopyable {
@@ -67,9 +67,9 @@ protected:
 
     /** Subclasses registers their resources using this function. It is assumed the GrProgramResouce
         is and will remain owned by the subclass and this function will retain a raw ptr. Once a
-        GrProgramResource is registered its setResource must not be called.
+        GrGpuResourceRef is registered its setResource must not be called.
      */
-    void addProgramResource(const GrProgramResource* res) {
+    void addProgramResource(const GrGpuResourceRef* res) {
         fProgramResources.push_back(res);
     }
 
@@ -85,7 +85,7 @@ private:
     mutable int32_t fPendingExecutions;
     uint32_t        fUniqueID;
 
-    SkSTArray<4, const GrProgramResource*, true> fProgramResources;
+    SkSTArray<4, const GrGpuResourceRef*, true> fProgramResources;
 
     // Only this class can access convertRefToPendingExecution() and completedExecution().
     template <typename T> friend class GrProgramElementRef;