commit f96ba02513eadd9fa24d75396ec9f2d6682e464c
author bsalomon <bsalomon@google.com> Wed Sep 17 08:05:40 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Sep 17 08:05:40 2014 -0700
tree 099e3c820265428e5aad86d236fed2b1252294f8
parent 4aa6dfc0b77af9ac298bb9d48991b72a2fec00b2

Rename GrProgramResource to GrGpuResourceRef

BUG=skia:2889
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/574333003

include/gpu/GrProgramElement.h

diff --git a/include/gpu/GrProgramElement.h b/include/gpu/GrProgramElement.h
index 5f88a2a..8d23ba2 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 @@
  * 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
+ * addGpuResource(). 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,10 +67,10 @@
 
     /** 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) {
-        fProgramResources.push_back(res);
+    void addGpuResource(const GrGpuResourceRef* res) {
+        fGpuResources.push_back(res);
     }
 
 private:
@@ -85,7 +85,7 @@
     mutable int32_t fPendingExecutions;
     uint32_t        fUniqueID;
 
-    SkSTArray<4, const GrProgramResource*, true> fProgramResources;
+    SkSTArray<4, const GrGpuResourceRef*, true> fGpuResources;
 
     // Only this class can access convertRefToPendingExecution() and completedExecution().
     template <typename T> friend class GrProgramElementRef;