Delete GrTextContext

src/gpu/text/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"
+#include "SkDrawFilter.h"
+#include "SkTextBlob.h"
 #include "SkTHash.h"
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
 #include "batches/GrDrawPathBatch.h"
 
 class GrAtlasTextContext;
 class GrTextStrike;
 class GrPath;
 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();
 
     void drawText(GrContext*, GrDrawContext* dc,
                   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();
 
 private:
     GrStencilAndCoverTextContext();
 
     bool canDraw(const SkPaint& skPaint, const SkMatrix&) {
         return this->internalCanDraw(skPaint);
     }
 
@@ skipping 16 matching lines @@
         ~TextRun();
 
         void setText(const char text[], size_t byteLength, SkScalar x, SkScalar y);
 
         void setPosText(const char text[], size_t byteLength, const SkScalar pos[],
                         int scalarsPerPosition, const SkPoint& offset);
 
         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;
 
         size_t computeSizeInCache() const;
 
     private:
         typedef GrDrawPathRangeBatch::InstanceData InstanceData;
 
         SkGlyphCache* getGlyphCache() const;
         GrPathRange* createGlyphs(GrContext*) const;
@@ skipping 50 matching lines @@
     };
 
     const TextBlob& findOrCreateTextBlob(const SkTextBlob*, const SkPaint&);
     void purgeToFit(const TextBlob&);
 
     GrAtlasTextContext*                                       fFallbackTextContext;
     SkTHashMap<uint32_t, TextBlob*>                           fBlobIdCache;
     SkTHashTable<TextBlob*, const TextBlob::Key&, TextBlob>   fBlobKeyCache;
     SkTInternalLList<TextBlob>                                fLRUList;
     size_t                                                    fCacheSize;
-
-    typedef GrTextContext INHERITED;
 };
 
 #endif