A small patch to enable distance field text in textblobs

src/gpu/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
 
@@ skipping 192 matching lines @@
         int fRunCount;
         SkMaskFilter::BlurRec fBlurRec;
         struct StrokeInfo {
             SkScalar fFrameWidth;
             SkScalar fMiterLimit;
             SkPaint::Join fJoin;
         };
         StrokeInfo fStrokeInfo;
         GrMemoryPool* fPool;
 
+        enum TextType {
+            kHasDistanceField_TextType = 0x1,
+            kHasBitmap_TextType = 0x2,
+        };
+        uint8_t fTextType;
+
+        BitmapTextBlob() : fTextType(0) {}
+
         // all glyph / vertex offsets are into these pools.
         unsigned char* fVertices;
         GrGlyph::PackedID* fGlyphIDs;
         Run* fRuns;
 
         struct Key {
             Key() {
                 sk_bzero(this, sizeof(Key));
             }
             uint32_t fUniqueID;
@@ skipping 25 matching lines @@
         }
         void* operator new(size_t) {
             SkFAIL("All blobs are created by placement new.");
             return sk_malloc_throw(0);
         }
 
         void* operator new(size_t, void* p) { return p; }
         void operator delete(void* target, void* placement) {
             ::operator delete(target, placement);
         }
+
+        bool hasDistanceField() const { return SkToBool(fTextType & kHasDistanceField_TextType); }
+        bool hasBitmap() const { return SkToBool(fTextType & kHasBitmap_TextType); }
+        void setHasDistanceField() { fTextType |= kHasDistanceField_TextType; }
+        void setHasBitmap() { fTextType |= kHasBitmap_TextType; }
     };
 
     typedef BitmapTextBlob::Run Run;
     typedef Run::SubRunInfo PerSubRunInfo;
 
     inline bool canDrawAsDistanceFields(const SkPaint&, const SkMatrix& viewMatrix);
     BitmapTextBlob* setupDFBlob(int glyphCount, const SkPaint& origPaint,
                                 const SkMatrix& viewMatrix, SkGlyphCache** cache,
                                 SkPaint* dfPaint, SkScalar* textRatio);
     void bmpAppendGlyph(BitmapTextBlob*, int runIndex, GrGlyph::PackedID, int left, int top,
@@ skipping 18 matching lines @@
                                SkScalar transX, SkScalar transY);
 
     // We have to flush SkTextBlobs differently from drawText / drawPosText
     void flush(GrDrawTarget*, const SkTextBlob*, BitmapTextBlob*, GrRenderTarget*, const SkPaint&,
                const GrPaint&, SkDrawFilter*, const GrClip&, const SkMatrix& viewMatrix,
                const SkIRect& clipBounds, SkScalar x, SkScalar y, SkScalar transX, SkScalar transY);
     void flush(GrDrawTarget*, BitmapTextBlob*, GrRenderTarget*, const SkPaint&,
                const GrPaint&, const GrClip&);
 
     // A helper for drawing BitmapText in a run of distance fields
-    inline void fallbackDrawPosText(BitmapTextBlob*, GrRenderTarget*, const GrClip&,
+    inline void fallbackDrawPosText(BitmapTextBlob*, int runIndex,
+                                    GrRenderTarget*, const GrClip&,
                                     const GrPaint&,
                                     const SkPaint&, const SkMatrix& viewMatrix,
                                     const SkTDArray<char>& fallbackTxt,
                                     const SkTDArray<SkScalar>& fallbackPos,
                                     int scalarsPerPosition,
                                     const SkPoint& offset,
                                     const SkIRect& clipRect);
 
     void internalDrawBMPText(BitmapTextBlob*, int runIndex, SkGlyphCache*, const SkPaint&,
                              GrColor color, const SkMatrix& viewMatrix,
@@ skipping 25 matching lines @@
     // sets up the descriptor on the blob and returns a detached cache.  Client must attach
     inline static GrColor ComputeCanonicalColor(const SkPaint&, bool lcd);
     inline SkGlyphCache* setupCache(Run*, const SkPaint&, const SkMatrix* viewMatrix, bool noGamma);
     static inline bool MustRegenerateBlob(SkScalar* outTransX, SkScalar* outTransY,
                                           const BitmapTextBlob&, const SkPaint&,
                                           const SkMaskFilter::BlurRec&,
                                           const SkMatrix& viewMatrix, SkScalar x, SkScalar y);
     void regenerateTextBlob(BitmapTextBlob* bmp, const SkPaint& skPaint, GrColor,
                             const SkMatrix& viewMatrix,
                             const SkTextBlob* blob, SkScalar x, SkScalar y,
-                            SkDrawFilter* drawFilter, const SkIRect& clipRect);
+                            SkDrawFilter* drawFilter, const SkIRect& clipRect, GrRenderTarget*,
+                            const GrClip&, const GrPaint&);
     inline static bool HasLCD(const SkTextBlob*);
     inline void initDistanceFieldPaint(SkPaint*, SkScalar* textRatio, const SkMatrix&);
 
     // Distance field text needs this table to compute a value for use in the fragment shader.
     // Because the GrAtlasTextContext can go out of scope before the final flush, this needs to be
     // refcnted and malloced
     struct DistanceAdjustTable : public SkNVRefCnt<DistanceAdjustTable> {
         DistanceAdjustTable(float gamma) { this->buildDistanceAdjustTable(gamma); }
         ~DistanceAdjustTable() { SkDELETE_ARRAY(fTable); }
 
@@ skipping 15 matching lines @@
     bool fEnableDFRendering;
     SkAutoTUnref<DistanceAdjustTable> fDistanceAdjustTable;
 
     friend class GrTextBlobCache;
     friend class BitmapTextBatch;
 
     typedef GrTextContext INHERITED;
 };
 
 #endif