Delete GrTextContext

src/gpu/text/GrAtlasTextContext.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAtlasTextContext_DEFINED
 #define GrAtlasTextContext_DEFINED
 
-#include "GrTextContext.h"
-
 #include "GrAtlasTextBlob.h"
 #include "GrDistanceFieldAdjustTable.h"
 #include "GrGeometryProcessor.h"
 #include "SkTextBlobRunIterator.h"
 
 #ifdef GR_TEST_UTILS
 #include "GrBatchTest.h"
 #endif
 
 class GrDrawBatch;
 class GrDrawContext;
 class GrDrawTarget;
 class GrPipelineBuilder;
 class GrTextBlobCache;
 class SkGlyph;
 
 /*
- * This class implements GrTextContext using standard bitmap fonts, and can also process textblobs.
+ * Renders text using some kind of an atlas, ie BitmapText or DistanceField text
  */
-class GrAtlasTextContext : public GrTextContext {
+class GrAtlasTextContext {
 public:
     static GrAtlasTextContext* Create();
 
     bool canDraw(const SkPaint&, const SkMatrix& viewMatrix, const SkSurfaceProps&,
                  const GrShaderCaps&);
     void drawText(GrContext*, GrDrawContext*, const GrClip&, const GrPaint&, const SkPaint&,
                   const SkMatrix& viewMatrix, const SkSurfaceProps&, const char text[],
                   size_t byteLength, SkScalar x, SkScalar y,
-                  const SkIRect& regionClipBounds) override;
+                  const SkIRect& regionClipBounds);
     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& regionClipBounds) override;
+                     const SkPoint& offset, const SkIRect& regionClipBounds);
     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);
 
 private:
     GrAtlasTextContext();
 
     // sets up the descriptor on the blob and returns a detached cache.  Client must attach
     inline static GrColor ComputeCanonicalColor(const SkPaint&, bool lcd);
     static void RegenerateTextBlob(GrAtlasTextBlob* bmp,
                                    GrBatchFontCache*,
                                    const GrShaderCaps&,
                                    const SkPaint& skPaint, GrColor,
@@ skipping 19 matching lines @@
                                                          const SkScalar pos[],
                                                          int scalarsPerPosition,
                                                          const SkPoint& offset);
     const GrDistanceFieldAdjustTable* dfAdjustTable() const { return fDistanceAdjustTable; }
 
     SkAutoTUnref<const GrDistanceFieldAdjustTable> fDistanceAdjustTable;
 
 #ifdef GR_TEST_UTILS
     DRAW_BATCH_TEST_FRIEND(TextBlobBatch);
 #endif
-
-    typedef GrTextContext INHERITED;
 };
 
 #endif