Make GrTextContext be owned by the GrDrawContext

include/gpu/GrDrawContext.h

Index: include/gpu/GrDrawContext.h
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h
index 4b78c89f918379586266c024cb7dd5398eaab828..90fa4ae1365b848a5d28d5b177184ee3d865c173 100644
--- a/include/gpu/GrDrawContext.h
+++ b/include/gpu/GrDrawContext.h
@@ -22,14 +22,18 @@ class GrPipelineBuilder;
 class GrRenderTarget;
 class GrStrokeInfo;
 class GrSurface;
+class GrTextContext;
+struct SkDeviceProperties;
+class SkDrawFilter;
 struct SkIPoint;
 struct SkIRect;
 class SkMatrix;
+class SkPaint;
 class SkPath;
 struct SkPoint;
 struct SkRect;
 class SkRRect;
-
+class SkTextBlob;
 
 /*
  * A helper object to orchestrate draws
@@ -38,14 +42,25 @@ class SK_API GrDrawContext : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrDrawContext)
 
+    ~GrDrawContext() override;
+
     void copySurface(GrRenderTarget* dst, GrSurface* src,
                      const SkIRect& srcRect, const SkIPoint& dstPoint);
 
-    // drawText and drawPaths are thanks to the GrAtlasTextContext and the 
-    // GrStencilAndCoverTextContext respectively
-    // TODO: remove these two
-    void drawText(GrPipelineBuilder* pipelineBuilder, GrBatch* batch);
+    void drawText(GrRenderTarget*, const GrClip&,  const GrPaint&, const SkPaint&,

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

Can we have a TODO (here or a bug) to remove the need for SkPaint? It seems
weird that we pass both paints. It'd be cleaner to extract the text params from
SkPaint and not pass the whole thing (equivalent to GrStrokeInfo).

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

Done.

+                  const SkMatrix& viewMatrix, const char text[], size_t byteLength,
+                  SkScalar x, SkScalar y, const SkIRect& clipBounds);
+    void drawPosText(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
+                     const SkMatrix& viewMatrix, const char text[], size_t byteLength,
+                     const SkScalar pos[], int scalarsPerPosition,
+                     const SkPoint& offset, const SkIRect& clipBounds);
+    void drawTextBlob(GrRenderTarget*, const GrClip&, const SkPaint&,
+                      const SkMatrix& viewMatrix, const SkTextBlob*,
+                      SkScalar x, SkScalar y,
+                      SkDrawFilter*, const SkIRect& clipBounds);
 
+    // drawPaths is thanks to GrStencilAndCoverTextContext
+    // TODO: remove
     void drawPaths(GrPipelineBuilder* pipelineBuilder,
                    const GrPathProcessor* pathProc,
                    const GrPathRange* pathRange,
@@ -223,16 +238,17 @@ public:
 
 
 private:
+    friend class GrAtlasTextContext; // for access to drawBatch
     friend class GrContext; // for ctor
 
-    GrDrawContext(GrContext* context, GrDrawTarget* drawTarget);
-    ~GrDrawContext() override;
+    GrDrawContext(GrContext*, GrDrawTarget*, const SkDeviceProperties&, bool useDFT);
 
     // Sets the paint. Returns true on success; false on failure.
     bool prepareToDraw(GrPipelineBuilder*,
                        GrRenderTarget* rt,
                        const GrClip&,
                        const GrPaint* paint);
+    GrTextContext* createTextContext(GrRenderTarget*, const SkDeviceProperties&, bool useDFT);
 
     // A simpler version of the above which just returns true on success; false on failure.  
     // Clip is *NOT* set
@@ -246,8 +262,16 @@ private:
                           const SkPath&,
                           const GrStrokeInfo&);
 
-    GrContext*     fContext;     // owning context -> no ref
-    GrDrawTarget*  fDrawTarget;
+    // This entry point allows the GrTextContext-derived classes to add their batches to
+    // the drawTarget.
+    void drawBatch(GrPipelineBuilder* pipelineBuilder, GrBatch* batch);
+
+    GrContext*          fContext;     // owning context -> no ref
+    GrDrawTarget*       fDrawTarget;
+    GrTextContext*      fTextContext; // lazily created

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

would we share these in the future when there is a DC per RT? Curious cuz the DC
params from TC draw methods are removed.

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

I think the TextContexts will have to morph a bit when we have a DC per RT. It
seems like we would want a portion that is specific to each DC (that, say, hold
the glyph bitmaps that need to be uploaded to flush the DC) and a portion that
is shared (which, say, manage the caches).

+
+    SkDeviceProperties* fDevProps;    // ptr b.c. SkDeviceProperties isn't public
+    bool                fUseDFT;
 };
 
 #endif