Replace factory generation of TextContexts with persistent objects.

include/gpu/SkGpuDevice.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
 #ifndef SkGpuDevice_DEFINED
 #define SkGpuDevice_DEFINED
 
 #include "SkGr.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
 #include "SkRegion.h"
 #include "GrContext.h"
 
 struct SkDrawProcs;
 struct GrSkDrawProcs;
 
-class GrTextContextManager;
+class GrTextContext;
 
 /**
  *  Subclass of SkBitmapDevice, which directs all drawing to the GrGpu owned by the
  *  canvas.
  */
 class SK_API SkGpuDevice : public SkBitmapDevice {
 public:
 
     /**
      * Creates an SkGpuDevice from a GrSurface. This will fail if the surface is not a render
@@ skipping 109 matching lines @@
                               int x, int y,
                               SkCanvas::Config8888 config8888) SK_OVERRIDE;
 
 private:
     GrContext*      fContext;
 
     GrSkDrawProcs*  fDrawProcs;
 
     GrClipData      fClipData;
 
-    GrTextContextManager* fTextContextManager;
+    GrTextContext*  fMainTextContext;
+    GrTextContext*  fFallbackTextContext;
 
     // state for our render-target
     GrRenderTarget*     fRenderTarget;
     bool                fNeedClear;
 
     // called from rt and tex cons
     void initFromRenderTarget(GrContext*, GrRenderTarget*, bool cached);
 
     // used by createCompatibleDevice
     SkGpuDevice(GrContext*, GrTexture* texture, bool needClear);
@@ skipping 42 matching lines @@
                          const GrTextureParams& params,
                          const SkPaint& paint,
                          SkCanvas::DrawBitmapRectFlags flags,
                          int tileSize,
                          bool bicubic);
 
     typedef SkBitmapDevice INHERITED;
 };
 
 #endif