Make GrTextContext no longer store a GrDrawContext

src/gpu/GrStencilAndCoverTextContext.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrStencilAndCoverTextContext_DEFINED
 #define GrStencilAndCoverTextContext_DEFINED
 
 #include "GrTextContext.h"
 #include "GrDrawTarget.h"
 #include "GrStrokeInfo.h"
 
 class GrTextStrike;
 class GrPath;
 class GrPathRange;
 class SkSurfaceProps;
 
 /*
  * This class implements text rendering using stencil and cover path rendering
  * (by the means of GrDrawTarget::drawPath).
  * This class exposes the functionality through GrTextContext interface.
  */
 class GrStencilAndCoverTextContext : public GrTextContext {
 public:
-    static GrStencilAndCoverTextContext* Create(GrContext*, GrDrawContext*,
-                                                const SkSurfaceProps&);
+    static GrStencilAndCoverTextContext* Create(GrContext*, const SkSurfaceProps&);
 
     virtual ~GrStencilAndCoverTextContext();
 
 private:
     static const int kGlyphBufferSize = 1024;
 
     enum RenderMode {
         /**
          * This is the render mode used by drawText(), which is mainly used by
          * the Skia unit tests. It tries match the other text backends exactly,
@@ skipping 27 matching lines @@
     SkMatrix                                            fViewMatrix;
     SkMatrix                                            fLocalMatrix;
     bool                                                fUsingDeviceSpaceGlyphs;
     SkAutoTUnref<GrRenderTarget>                        fRenderTarget;
     GrClip                                              fClip;
     SkIRect                                             fClipRect;
     SkIRect                                             fRegionClipBounds;
     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,
                        const SkPoint& offset, const SkIRect& regionClipBounds) override;
 
     void init(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
               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);
 
 };
 
 #endif