Allow gpu ResourceHandle class to be shared for multiple purposes

src/gpu/glsl/GrGLSLProgramDataManager.h

Index: src/gpu/glsl/GrGLSLProgramDataManager.h
diff --git a/src/gpu/glsl/GrGLSLProgramDataManager.h b/src/gpu/glsl/GrGLSLProgramDataManager.h
index e578e11808868163ce18c41e0093601f78d025bf..5e57056b3c98ef94cc801f5ca7b8bf460576b3f0 100644
--- a/src/gpu/glsl/GrGLSLProgramDataManager.h
+++ b/src/gpu/glsl/GrGLSLProgramDataManager.h
@@ -8,6 +8,7 @@
 #ifndef GrGLSLProgramDataManager_DEFINED
 #define GrGLSLProgramDataManager_DEFINED
 
+#include "GrResourceHandle.h"
 #include "SkTypes.h"
 
 class SkMatrix;
@@ -18,28 +19,7 @@ class SkMatrix;
  */
 class GrGLSLProgramDataManager : SkNoncopyable {
 public:
-    // Opaque handle to a resource
-    class ShaderResourceHandle {
-    public:
-        ShaderResourceHandle(int value)
-            : fValue(value) {
-            SkASSERT(this->isValid());
-        }
-
-        ShaderResourceHandle()
-            : fValue(kInvalid_ShaderResourceHandle) {
-        }
-
-        bool operator==(const ShaderResourceHandle& other) const { return other.fValue == fValue; }
-        bool isValid() const { return kInvalid_ShaderResourceHandle != fValue; }
-        int toIndex() const { SkASSERT(this->isValid()); return fValue; }
-
-    private:
-        static const int kInvalid_ShaderResourceHandle = -1;
-        int fValue;
-    };
-
-    typedef ShaderResourceHandle UniformHandle;
+    GR_DEFINE_RESOURCE_HANDLE_CLASS(UniformHandle);
 
     virtual ~GrGLSLProgramDataManager() {}
 
@@ -67,7 +47,7 @@ public:
     void setSkMatrix(UniformHandle, const SkMatrix&) const;
 
     // for nvpr only

[robertphillips, 2016/05/09 13:13:11]

We don't want a new VaryingHandle type here ?

[bsalomon, 2016/05/09 13:25:23]

Good point

[egdaniel, 2016/05/09 17:19:54]

Done.

-    typedef ShaderResourceHandle VaryingHandle;
+    typedef UniformHandle VaryingHandle;
     virtual void setPathFragmentInputTransform(VaryingHandle u, int components,
                                                const SkMatrix& matrix) const = 0;
 
@@ -75,7 +55,6 @@ protected:
     GrGLSLProgramDataManager() {}
 
 private:
-
     typedef SkNoncopyable INHERITED;
 };