Start trying to collapse path program stuff

src/gpu/gl/GrGLProgramDataManager.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLProgramDataManager_DEFINED
 #define GrGLProgramDataManager_DEFINED
 
 #include "gl/GrGLShaderVar.h"
 #include "GrAllocator.h"
 
 #include "SkTArray.h"
 
 class GrGLGpu;
 class SkMatrix;
 class GrGLProgram;
 class GrGLProgramBuilder;
 
 /** Manages the resources used by a shader program.
  * The resources are objects the program uses to communicate with the
  * application code.
  */
 class GrGLProgramDataManager : SkNoncopyable {
 public:
-    // Opaque handle to a uniform
+    // Opaque handle to a resource
     class ShaderResourceHandle {
     public:
-        bool isValid() const { return -1 != fValue; }
-        ShaderResourceHandle()
-            : fValue(-1) {
-        }
-    protected:
         ShaderResourceHandle(int value)
             : fValue(value) {
-            SkASSERT(isValid());
+            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;
     };
 
-    class UniformHandle : public ShaderResourceHandle {
-    public:
-        /** Creates a reference to an unifrom of a GrGLShaderBuilder.
-         * The ref can be used to set the uniform with corresponding the GrGLProgramDataManager.*/
-        static UniformHandle CreateFromUniformIndex(int i);
-        UniformHandle() { }
-        bool operator==(const UniformHandle& other) const { return other.fValue == fValue; }
-    private:
-        UniformHandle(int value) : ShaderResourceHandle(value) { }
-        int toProgramDataIndex() const { SkASSERT(isValid()); return fValue; }
-        int toShaderBuilderIndex() const { return toProgramDataIndex(); }
-
-        friend class GrGLProgramDataManager; // For accessing toProgramDataIndex().
-        friend class GrGLProgramBuilder; // For accessing toShaderBuilderIndex().
-        friend class GrGLGeometryProcessor;
-    };
+    typedef ShaderResourceHandle UniformHandle;
 
     struct UniformInfo {
         GrGLShaderVar fVariable;
         uint32_t      fVisibility;
         GrGLint       fLocation;
     };
 
     // This uses an allocator rather than array so that the GrGLShaderVars don't move in memory
     // after they are inserted. Users of GrGLShaderBuilder get refs to the vars and ptrs to their
     // name strings. Otherwise, we'd have to hand out copies.
@@ skipping 39 matching lines @@
 
     SkDEBUGCODE(void printUnused(const Uniform&) const;)
 
     SkTArray<Uniform, true> fUniforms;
     GrGLGpu* fGpu;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif