Make GrTextContext no longer store a GrDrawContext

src/gpu/GrStencilAndCoverTextContext.h

Index: src/gpu/GrStencilAndCoverTextContext.h
diff --git a/src/gpu/GrStencilAndCoverTextContext.h b/src/gpu/GrStencilAndCoverTextContext.h
index 40591c84993b4cb2e1498f5afde0b86519d07795..295e958036fc4682c24c354b336ec747f33ce267 100644
--- a/src/gpu/GrStencilAndCoverTextContext.h
+++ b/src/gpu/GrStencilAndCoverTextContext.h
@@ -24,8 +24,7 @@ class SkSurfaceProps;
  */
 class GrStencilAndCoverTextContext : public GrTextContext {
 public:
-    static GrStencilAndCoverTextContext* Create(GrContext*, GrDrawContext*,
-                                                const SkSurfaceProps&);
+    static GrStencilAndCoverTextContext* Create(GrContext*, const SkSurfaceProps&);
 
     virtual ~GrStencilAndCoverTextContext();
 
@@ -73,16 +72,17 @@ private:
     GrPaint                                             fPaint;
     SkPaint                                             fSkPaint;
 
-    GrStencilAndCoverTextContext(GrContext*, GrDrawContext*, const SkSurfaceProps&);
+    GrStencilAndCoverTextContext(GrContext*, const SkSurfaceProps&);
 
     bool canDraw(const GrRenderTarget*, const GrClip&, const GrPaint&,
                  const SkPaint&, const SkMatrix& viewMatrix) override;
 
-    void onDrawText(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
+    void onDrawText(GrDrawContext*, GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
                     const SkMatrix& viewMatrix,
                     const char text[], size_t byteLength,
                     SkScalar x, SkScalar y, const SkIRect& regionClipBounds) override;
-    void onDrawPosText(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
+    void onDrawPosText(GrDrawContext*, GrRenderTarget*,
+                       const GrClip&, const GrPaint&, const SkPaint&,
                        const SkMatrix& viewMatrix,
                        const char text[], size_t byteLength,
                        const SkScalar pos[], int scalarsPerPosition,
@@ -92,9 +92,9 @@ private:
               size_t textByteLength, RenderMode, const SkMatrix& viewMatrix,
               const SkIRect& regionClipBounds);
     bool mapToFallbackContext(SkMatrix* inverse);
-    void appendGlyph(const SkGlyph&, const SkPoint&);
-    void flush();
-    void finish();
+    void appendGlyph(GrDrawContext* dc, const SkGlyph&, const SkPoint&);
+    void flush(GrDrawContext* dc);
+    void finish(GrDrawContext* dc);
 
 };