Small change to allow DistanceField and BMP text to coexist in a blob

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 96 matching lines @@
                 uint64_t fAtlasGeneration;
                 uint32_t fGlyphStartIndex;
                 uint32_t fGlyphEndIndex;
                 size_t fVertexStartIndex;
                 size_t fVertexEndIndex;
                 GrBatchAtlas::BulkUseTokenUpdater fBulkUseToken;
 
                 // distance field properties
                 bool fDrawAsDistanceFields;
                 bool fUseLCDText;
+                // Distance field text cannot draw coloremoji, and so has to fall back.  However,
+                // though the distance field text and the coloremoji may share the same run, they
+                // will have different descriptors.  If fOverrideDescriptor is non-NULL, then it
+                // will be used in place of the run's descriptor to regen texture coords
+                SkAutoTDelete<SkAutoDescriptor> fOverrideDescriptor;

[jvanverth1, 2015/04/17 17:07:16]

A suggestion to investigate for the future is to cache descriptors and just
always store a pointer to subrun's descriptor here, so no need to check if it's
NULL later.

             };
 
             class SubRunInfoArray {
             public:
                 SubRunInfoArray()
                     : fSubRunCount(0)
                     , fSubRunAllocation(kMinSubRuns) {
+                    SK_COMPILE_ASSERT(kMinSubRuns > 0, insufficient_subrun_allocation);
+                    // We always seed with one here, so we can assume a valid subrun during
+                    // push_back
                     fPtr = reinterpret_cast<SubRunInfo*>(fSubRunStorage.get());
-                    this->push_back();
+                    SkNEW_PLACEMENT(&fPtr[fSubRunCount++], SubRunInfo);
+                }
+                ~SubRunInfoArray() {
+                    for (int i = 0; i < fSubRunCount; i++) {
+                        fPtr[i].~SubRunInfo();
+                    }
                 }
 
                 int count() const { return fSubRunCount; }
                 SubRunInfo& back() { return fPtr[fSubRunCount - 1]; }
                 SubRunInfo& push_back() {
                     if (fSubRunCount >= fSubRunAllocation) {
                         fSubRunAllocation = fSubRunAllocation << 1;
                         fSubRunStorage.realloc(fSubRunAllocation * sizeof(SubRunInfo));
                         fPtr = reinterpret_cast<SubRunInfo*>(fSubRunStorage.get());
                     }
                     SkNEW_PLACEMENT(&fPtr[fSubRunCount], SubRunInfo);
+
+                    // Forward glyph / vertex information to seed the new sub run
+                    SubRunInfo& newSubRun = fPtr[fSubRunCount];
+                    SubRunInfo& prevSubRun = fPtr[fSubRunCount - 1];
+                    newSubRun.fGlyphStartIndex = prevSubRun.fGlyphEndIndex;
+                    newSubRun.fGlyphEndIndex = prevSubRun.fGlyphEndIndex;
+
+                    newSubRun.fVertexStartIndex = prevSubRun.fVertexEndIndex;
+                    newSubRun.fVertexEndIndex = prevSubRun.fVertexEndIndex;
                     return fPtr[fSubRunCount++];
                 }
                 SubRunInfo& operator[](int index) {
                     return fPtr[index];
                 }
                 const SubRunInfo& operator[](int index) const {
                     return fPtr[index];
                 }
 
             private:
@@ skipping 114 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(GrRenderTarget*, const GrClip&,
+    inline void fallbackDrawPosText(BitmapTextBlob*, 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 61 matching lines @@
     bool fEnableDFRendering;
     SkAutoTUnref<DistanceAdjustTable> fDistanceAdjustTable;
 
     friend class GrTextBlobCache;
     friend class BitmapTextBatch;
 
     typedef GrTextContext INHERITED;
 };
 
 #endif