Solo gp

src/gpu/GrBitmapTextContext.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBitmapTextContext_DEFINED
 #define GrBitmapTextContext_DEFINED
 
 #include "GrTextContext.h"
 
+class GrGeometryProcessor;
 class GrTextStrike;
 
 /*
  * This class implements GrTextContext using standard bitmap fonts
  */
 class GrBitmapTextContext : public GrTextContext {
 public:
     GrBitmapTextContext(GrContext*, const SkDeviceProperties&);
     virtual ~GrBitmapTextContext();
 
@@ skipping 14 matching lines @@
     void flushGlyphs();                 // automatically called by destructor
     void finish();
 
     enum {
         kMinRequestedGlyphs      = 1,
         kDefaultRequestedGlyphs  = 64,
         kMinRequestedVerts       = kMinRequestedGlyphs * 4,
         kDefaultRequestedVerts   = kDefaultRequestedGlyphs * 4,
     };
 
-    void*                       fVertices;
-    int32_t                     fMaxVertices;
-    GrTexture*                  fCurrTexture;
-    SkAutoTUnref<GrEffect>      fCachedEffect;
+    void*                             fVertices;
+    int32_t                           fMaxVertices;
+    GrTexture*                        fCurrTexture;
+    SkAutoTUnref<GrGeometryProcessor> fCachedGeometryProcessor;
     // Used to check whether fCachedEffect is still valid.
-    uint32_t                    fEffectTextureUniqueID;
-    int                         fCurrVertex;
-    SkRect                      fVertexBounds;
+    uint32_t                          fEffectTextureUniqueID;
+    int                               fCurrVertex;
+    SkRect                            fVertexBounds;
 };
 
 #endif