Separate out GrSurfaceConfig's fields from other structs used to create GrGL* GrSurface subclasses

src/gpu/gl/GrGLRenderTarget.h

Index: src/gpu/gl/GrGLRenderTarget.h
diff --git a/src/gpu/gl/GrGLRenderTarget.h b/src/gpu/gl/GrGLRenderTarget.h
index de9f4c1aa08c15198a8c00e29c1b25be0fe76b74..116862bd0b388d48a33bbb6fe57c6f0a56741aba 100644
--- a/src/gpu/gl/GrGLRenderTarget.h
+++ b/src/gpu/gl/GrGLRenderTarget.h
@@ -24,28 +24,19 @@ public:
     // Gr doesn't know how to resolve it.
     enum { kUnresolvableFBOID = 0 };
 
-    struct Desc {
+    struct IDDesc {
         GrGLuint         fRTFBOID;
         GrGLuint         fTexFBOID;
         GrGLuint         fMSColorRenderbufferID;
         bool             fIsWrapped;
-        GrPixelConfig    fConfig;
-        int              fSampleCnt;
-        GrSurfaceOrigin  fOrigin;
-        bool             fCheckAllocation;
     };
 
     // creates a GrGLRenderTarget associated with a texture
-    GrGLRenderTarget(GrGpuGL*          gpu,
-                     const Desc&       desc,
-                     const GrGLIRect&  viewport,
-                     GrGLTexID*        texID,
-                     GrGLTexture*      texture);
+    GrGLRenderTarget(GrGpuGL*, const IDDesc&, const GrGLIRect& viewport,
+                     GrGLTexID*, GrGLTexture*);
 
     // creates an independent GrGLRenderTarget
-    GrGLRenderTarget(GrGpuGL*          gpu,
-                     const Desc&       desc,
-                     const GrGLIRect&  viewport);
+    GrGLRenderTarget(GrGpuGL*, const GrSurfaceDesc&, const IDDesc&, const GrGLIRect& viewport);
 
     virtual ~GrGLRenderTarget() { this->release(); }
 
@@ -99,7 +90,7 @@ private:
     // non-NULL if this RT was created by Gr with an associated GrGLTexture.
     SkAutoTUnref<GrGLTexID> fTexIDObj;
 
-    void init(const Desc& desc, const GrGLIRect& viewport, GrGLTexID* texID);
+    void init(const GrSurfaceDesc&, const IDDesc&, const GrGLIRect& viewport, GrGLTexID*);
 
     typedef GrRenderTarget INHERITED;
 };