Delete GrTextContext

src/gpu/text/GrStencilAndCoverTextContext.h

Index: src/gpu/text/GrStencilAndCoverTextContext.h
diff --git a/src/gpu/text/GrStencilAndCoverTextContext.h b/src/gpu/text/GrStencilAndCoverTextContext.h
index 302df0b5fc5a020d349d7ff48db35629de82a339..892e279f59fbc7eb47ac7d333abd6fc60dfe56fd 100644
--- a/src/gpu/text/GrStencilAndCoverTextContext.h
+++ b/src/gpu/text/GrStencilAndCoverTextContext.h
@@ -8,9 +8,10 @@
 #ifndef GrStencilAndCoverTextContext_DEFINED
 #define GrStencilAndCoverTextContext_DEFINED
 
-#include "GrTextContext.h"
 #include "GrDrawTarget.h"
 #include "GrStrokeInfo.h"
+#include "SkDrawFilter.h"
+#include "SkTextBlob.h"
 #include "SkTHash.h"
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
@@ -24,9 +25,8 @@ 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 {
+class GrStencilAndCoverTextContext {
 public:
     static GrStencilAndCoverTextContext* Create();
 
@@ -34,17 +34,17 @@ public:
                   const GrClip&,  const GrPaint&, const SkPaint&,
                   const SkMatrix& viewMatrix, const SkSurfaceProps&, const char text[],
                   size_t byteLength, SkScalar x,
-                  SkScalar y, const SkIRect& clipBounds) override;
+                  SkScalar y, const SkIRect& clipBounds);
     void drawPosText(GrContext*, GrDrawContext*,
                      const GrClip&, const GrPaint&, const SkPaint&,
                      const SkMatrix& viewMatrix, const SkSurfaceProps&,
                      const char text[], size_t byteLength,
                      const SkScalar pos[], int scalarsPerPosition,
-                     const SkPoint& offset, const SkIRect& clipBounds) override;
+                     const SkPoint& offset, const SkIRect& clipBounds);
     void drawTextBlob(GrContext*, GrDrawContext*, const GrClip&, const SkPaint&,
                       const SkMatrix& viewMatrix, const SkSurfaceProps&, const SkTextBlob*,
                       SkScalar x, SkScalar y,
-                      SkDrawFilter*, const SkIRect& clipBounds) override;
+                      SkDrawFilter*, const SkIRect& clipBounds);
 
     virtual ~GrStencilAndCoverTextContext();
 
@@ -81,7 +81,7 @@ private:
         void draw(GrContext*, GrDrawContext*, GrPipelineBuilder*, GrColor, const SkMatrix&,
                   const SkSurfaceProps&,
                   SkScalar x, SkScalar y, const SkIRect& clipBounds,
-                  GrTextContext* fallbackTextContext, const SkPaint& originalSkPaint) const;
+                  GrAtlasTextContext* fallbackTextContext, const SkPaint& originalSkPaint) const;
 
         void releaseGlyphCache() const;
 
@@ -152,8 +152,6 @@ private:
     SkTHashTable<TextBlob*, const TextBlob::Key&, TextBlob>   fBlobKeyCache;
     SkTInternalLList<TextBlob>                                fLRUList;
     size_t                                                    fCacheSize;
-
-    typedef GrTextContext INHERITED;
 };
 
 #endif