Create GLSL base class for ProgramDataManager

src/gpu/gl/GrGLProcessor.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 GrGLProcessor_DEFINED
 #define GrGLProcessor_DEFINED
 
-#include "GrGLProgramDataManager.h"
 #include "GrProcessor.h"
+#include "GrShaderVar.h"
 #include "GrTextureAccess.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
 /** @file
     This file contains specializations for OpenGL of the shader stages declared in
     include/gpu/GrProcessor.h. Objects of type GrGLProcessor are responsible for emitting the
     GLSL code that implements a GrProcessor and for uploading uniforms at draw time. If they don't
     always emit the same GLSL code, they must have a function:
         static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*)
     that is used to implement a program cache. When two GrProcessors produce the same key this means
     that their GrGLProcessors would emit the same GLSL code.
 
     The GrGLProcessor subclass must also have a constructor of the form:
         ProcessorSubclass::ProcessorSubclass(const GrBackendProcessorFactory&, const GrProcessor&)
 
     These objects are created by the factory object returned by the GrProcessor::getFactory().
 */
 // TODO delete this and make TextureSampler its own thing
 class GrGLProcessor {
 public:
-    typedef GrGLProgramDataManager::UniformHandle UniformHandle;
+    typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
 
     /**
      * Passed to GrGLProcessors so they can add transformed coordinates to their shader code.
      */
     typedef GrShaderVar TransformedCoords;
     typedef SkTArray<GrShaderVar> TransformedCoordsArray;
 
     /**
      * Passed to GrGLProcessors so they can add texture reads to their shader code.
      */
@@ skipping 16 matching lines @@
         uint32_t      fConfigComponentMask;
         char          fSwizzle[5];
 
         friend class GrGLShaderBuilder;
     };
 
     typedef SkTArray<TextureSampler> TextureSamplerArray;
 };
 
 #endif