Fix for segfault on destruction of BitmapTextBlob

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 76 matching lines @@
          * glyphs.  However, its not clear if this is a win because we'd still have to either go the
          * glyph cache to get the path at flush time, or hold onto the path in the cache, which
          * would greatly increase the memory of these cached items.
          */
         struct Run {
             Run()
                 : fColor(GrColor_ILLEGAL)
                 , fInitialized(false)
                 , fDrawAsPaths(false) {
                 fVertexBounds.setLargestInverted();
+                // To ensure we always have one subrun, we push back a fresh run here
+                fSubRunInfo.push_back();
             }
             struct SubRunInfo {
                 SubRunInfo()
                     : fAtlasGeneration(GrBatchAtlas::kInvalidAtlasGeneration)
                     , fVertexStartIndex(0)
                     , fVertexEndIndex(0)
                     , fGlyphStartIndex(0)
                     , fGlyphEndIndex(0)
                     , fDrawAsDistanceFields(false) {}
                 // 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
                 // TODO we could have a descriptor cache, it would reduce the size of these blobs
                 // significantly, and then the subrun could just have a refed pointer to the
                 // correct descriptor.
-                SkAutoTDelete<SkAutoDescriptor> fOverrideDescriptor; // df properties
                 GrBatchAtlas::BulkUseTokenUpdater fBulkUseToken;
                 uint64_t fAtlasGeneration;
                 size_t fVertexStartIndex;
                 size_t fVertexEndIndex;
                 uint32_t fGlyphStartIndex;
                 uint32_t fGlyphEndIndex;
                 SkScalar fTextRatio; // df property
                 GrMaskFormat fMaskFormat;
                 bool fDrawAsDistanceFields; // df property
                 bool fUseLCDText; // df property
             };
 
-            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());
-                    SkNEW_PLACEMENT(&fPtr[fSubRunCount++], SubRunInfo);
-                }
-                ~SubRunInfoArray() {
-                    for (int i = 0; i < fSubRunCount; i++) {
-                        fPtr[i].~SubRunInfo();
-                    }
-                }
+            SubRunInfo& push_back() {
+                // Forward glyph / vertex information to seed the new sub run
+                SubRunInfo& prevSubRun = fSubRunInfo.back();
+                SubRunInfo& newSubRun = fSubRunInfo.push_back();
+                newSubRun.fGlyphStartIndex = prevSubRun.fGlyphEndIndex;
+                newSubRun.fGlyphEndIndex = prevSubRun.fGlyphEndIndex;
 
-                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:
-                static const int kMinSubRuns = 1;
-                static const int kMinSubRunStorage = kMinSubRuns * sizeof(SubRunInfo);
-                SubRunInfo* fPtr;
-                SkAutoSTMalloc<kMinSubRunStorage, unsigned char> fSubRunStorage;
-                int fSubRunCount;
-                int fSubRunAllocation;
-            };
+                newSubRun.fVertexStartIndex = prevSubRun.fVertexEndIndex;
+                newSubRun.fVertexEndIndex = prevSubRun.fVertexEndIndex;
+                return newSubRun;
+            }
+            static const int kMinSubRuns = 1;
             SkAutoTUnref<GrBatchTextStrike> fStrike;
             SkAutoTUnref<SkTypeface> fTypeface;
             SkRect fVertexBounds;
-            SubRunInfoArray fSubRunInfo;
+            SkSTArray<kMinSubRuns, SubRunInfo> fSubRunInfo;
             SkAutoDescriptor fDescriptor;
+            SkAutoTDelete<SkAutoDescriptor> fOverrideDescriptor; // df properties
             GrColor fColor;
             bool fInitialized;
             bool fDrawAsPaths;
         };
 
         struct BigGlyph {
             BigGlyph(const SkPath& path, int vx, int vy) : fPath(path), fVx(vx), fVy(vy) {}
             SkPath fPath;
             int fVx;
             int fVy;
@@ skipping 207 matching lines @@
     bool fEnableDFRendering;
     SkAutoTUnref<DistanceAdjustTable> fDistanceAdjustTable;
 
     friend class GrTextBlobCache;
     friend class BitmapTextBatch;
 
     typedef GrTextContext INHERITED;
 };
 
 #endif