Make GrTextContext be owned by the GrDrawContext

include/gpu/GrContext.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 GrContext_DEFINED
 #define GrContext_DEFINED
 
@@ skipping 25 matching lines @@
 class GrResourceEntry;
 class GrResourceCache;
 class GrResourceProvider;
 class GrTestTarget;
 class GrTextBlobCache;
 class GrTextContext;
 class GrTextureParams;
 class GrVertexBuffer;
 class GrStrokeInfo;
 class GrSoftwarePathRenderer;
-class SkGpuDevice;
 
 class SK_API GrContext : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrContext)
 
     /**
      * Creates a GrContext for a backend context.
      */
     static GrContext* Create(GrBackend, GrBackendContext, const GrContextOptions& options);
     static GrContext* Create(GrBackend, GrBackendContext);
@@ skipping 110 matching lines @@
      * @param  dpi the display density in dots per inch.
      *
      * @return sample count that should be perform well and have good enough
      *         rendering quality for the display. Alternatively returns 0 if
      *         MSAA is not supported or recommended to be used by default.
      */
     int getRecommendedSampleCount(GrPixelConfig config, SkScalar dpi) const;
 
     /**
      * Returns a helper object to orchestrate draws. 
+     * Callers should take a ref if they rely on the GrDrawContext sticking around.
+     * NULL will be returned if the context has been abandoned.
+     *
+     * @param  devProps the device properties (mainly defines text drawing)

[bsalomon, 2015/06/11 01:47:57]

devprops doesn't already have a DF flag? I guess I'm thinking of surfaceprops.
Should it?

[robertphillips, 2015/06/16 16:52:37]

I think that would be reasonable.

+     * @param  uesDFT should Distance Field Text be used?
      *
      * @return a draw context
      */
-    GrDrawContext* drawContext() {
-        return fDrawingMgr.drawContext();    
+    GrDrawContext* drawContext(const SkDeviceProperties* devProps = NULL, bool useDFT = false) {
+        return fDrawingMgr.drawContext(devProps, useDFT);    
     }
 
     ///////////////////////////////////////////////////////////////////////////
     // Misc.
 
     /**
      * Flags that affect flush() behavior.
      */
     enum FlushBits {
         /**
@@ skipping 191 matching lines @@
         void*         fInfo;
     };
 
     SkTDArray<CleanUpData>          fCleanUpData;
 
     const uint32_t                  fUniqueID;
 
     GrContext(); // init must be called after the constructor.
     bool init(GrBackend, GrBackendContext, const GrContextOptions& options);
 
-    // Currently the DrawingMgr just wraps the single GrDrawTarget in a single
-    // GrDrawContext and hands it out. In the future this class will allocate
-    // a new GrDrawContext for each GrRenderTarget/GrDrawTarget and manage
-    // the DAG.
+    // Currently the DrawingMgr stores a separate GrDrawContext for each
+    // combination of text drawing options (pixel geometry x DFT use)
+    // and hands the appropriate one back given the user's request.
+    // All of the GrDrawContexts still land in the same GrDrawTarget!
+    //
+    // In the future this class will allocate a new GrDrawContext for 
+    // each GrRenderTarget/GrDrawTarget and manage the DAG.
     class DrawingMgr {
     public:
-        DrawingMgr()
-            : fDrawTarget(NULL)
-            , fDrawContext(NULL) {
+        DrawingMgr() : fDrawTarget(NULL) {
+            sk_bzero(fDrawContext, sizeof(fDrawContext));
         }
 
         ~DrawingMgr();
 
         void init(GrContext* context);
 
         void abandon();
         bool abandoned() const { return NULL == fDrawTarget; }
 
         void purgeResources();
         void reset();
         void flush();
 
         // Callers should take a ref if they rely on the GrDrawContext sticking around.
         // NULL will be returned if the context has been abandoned.
-        GrDrawContext* drawContext();
+        GrDrawContext* drawContext(const SkDeviceProperties* devProps, bool useDFT);
 
     private:
         friend class GrContext;  // for access to fDrawTarget for testing
 
+        static const int kNumPixelGeometries = 5; // The different pixel geometries
+        static const int kNumDFTOptions = 2;      // DFT or no DFT
+
+        GrContext*        fContext;
         GrDrawTarget*     fDrawTarget;
 
-        GrDrawContext*    fDrawContext;
+        GrDrawContext*    fDrawContext[kNumPixelGeometries][kNumDFTOptions];
     };
 
     DrawingMgr                      fDrawingMgr;
 
     void initMockContext();
     void initCommon();
 
     /**
-     * Creates a new text rendering context that is optimal for the
-     * render target and the context. Caller assumes the ownership
-     * of the returned object. The returned object must be deleted
-     * before the context is destroyed.
-     * TODO bury this behind context!
-     */
-    GrTextContext* createTextContext(GrRenderTarget*,
-                                     const SkDeviceProperties&,
-                                     bool enableDistanceFieldFonts);
-
-
-    /**
      * These functions create premul <-> unpremul effects if it is possible to generate a pair
      * of effects that make a readToUPM->writeToPM->readToUPM cycle invariant. Otherwise, they
      * return NULL.
      */
     const GrFragmentProcessor* createPMToUPMEffect(GrTexture*, bool swapRAndB, const SkMatrix&);
     const GrFragmentProcessor* createUPMToPMEffect(GrTexture*, bool swapRAndB, const SkMatrix&);
 
     /**
      *  This callback allows the resource cache to callback into the GrContext
      *  when the cache is still over budget after a purge.
      */
     static void OverBudgetCB(void* data);
 
     /**
      * A callback similar to the above for use by the TextBlobCache
      * TODO move textblob draw calls below context so we can use the call above.
      */
     static void TextBlobCacheOverBudgetCB(void* data);
 
-    // TODO see note on createTextContext
-    friend class SkGpuDevice;
-
     typedef SkRefCnt INHERITED;
 };
 
 #endif