commit 8c27a188a0b216021d439eb627622d17b9f78343
author jvanverth <jvanverth@google.com> Tue Oct 14 08:45:50 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 14 08:45:50 2014 -0700
tree a110ce2b1b7b8ebe60c7d8b44af23a39632c4829
parent b501ecd0d7aa1c49c8c7f407ac6d51f5dc93122f

Change GrTextContext fallbacks to be a linked list chain.

Preliminary work for getting color emoji working with
distance field text.

BUG=skia:2887

Review URL: https://codereview.chromium.org/650273003

src/gpu/GrBitmapTextContext.h

diff --git a/src/gpu/GrBitmapTextContext.h b/src/gpu/GrBitmapTextContext.h
index a9805cb..7a93820 100644
--- a/src/gpu/GrBitmapTextContext.h
+++ b/src/gpu/GrBitmapTextContext.h
@@ -18,18 +18,10 @@
  */
 class GrBitmapTextContext : public GrTextContext {
 public:
-    GrBitmapTextContext(GrContext*, const SkDeviceProperties&);
+    static GrBitmapTextContext* Create(GrContext*, const SkDeviceProperties&);
+
     virtual ~GrBitmapTextContext();
 
-    virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
-
-    virtual void drawText(const GrPaint&, const SkPaint&, const char text[], size_t byteLength,
-                          SkScalar x, SkScalar y) SK_OVERRIDE;
-    virtual void drawPosText(const GrPaint&, const SkPaint&,
-                             const char text[], size_t byteLength,
-                             const SkScalar pos[], int scalarsPerPosition,
-                             const SkPoint& offset) SK_OVERRIDE;
-
 private:
     enum {
         kMinRequestedGlyphs      = 1,
@@ -49,6 +41,17 @@
     // Used to check whether fCachedEffect is still valid.
     uint32_t                          fEffectTextureUniqueID;
 
+    GrBitmapTextContext(GrContext*, const SkDeviceProperties&);
+
+    virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
+
+    virtual void onDrawText(const GrPaint&, const SkPaint&, const char text[], size_t byteLength,
+                            SkScalar x, SkScalar y) SK_OVERRIDE;
+    virtual void onDrawPosText(const GrPaint&, const SkPaint&,
+                               const char text[], size_t byteLength,
+                               const SkScalar pos[], int scalarsPerPosition,
+                               const SkPoint& offset) SK_OVERRIDE;
+
     void init(const GrPaint&, const SkPaint&);
     void appendGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontScaler*);
     void flush();                 // automatically called by destructor