More changes to bring together path / geo procs

src/gpu/gl/GrGLProgramDesc.h

Index: src/gpu/gl/GrGLProgramDesc.h
diff --git a/src/gpu/gl/GrGLProgramDesc.h b/src/gpu/gl/GrGLProgramDesc.h
index 401ce222fbf54b4c28902d4f8d2fd6091cb235ed..edf139e3a87c51d00a4643d1dbb342dafa1b29e5 100644
--- a/src/gpu/gl/GrGLProgramDesc.h
+++ b/src/gpu/gl/GrGLProgramDesc.h
@@ -21,10 +21,7 @@ class GrGLGpu;
  */
 class GrGLProgramDescBuilder {
 public:
-    struct GLKeyHeader : public GrProgramDesc::KeyHeader {
-        SkBool8 fUseNvpr;
-    };
-
+    typedef GrProgramDesc::KeyHeader KeyHeader;
     // The key, stored in fKey, is composed of five parts(first 2 are defined in the key itself):
     // 1. uint32_t for total key length.
     // 2. uint32_t for a checksum.
@@ -34,7 +31,7 @@ public:
     enum {
         // Part 3.
         kHeaderOffset = GrProgramDesc::kHeaderOffset,
-        kHeaderSize = SkAlign4(sizeof(GLKeyHeader)),
+        kHeaderSize = SkAlign4(sizeof(KeyHeader)),
         // Part 4.
         // This is the offset into the backenend specific part of the key, which includes
         // per-processor keys.
@@ -63,10 +60,6 @@ public:
                       GrGpu::DrawType,
                       GrGLGpu*,
                       GrProgramDesc*);
-
-    static const GLKeyHeader& GetHeader(const GrProgramDesc& desc) {
-        return *desc.atOffset<GLKeyHeader, kHeaderOffset>();
-    }
 };
 
 #endif