Fix caching of nvpr glyphs

src/gpu/batches/GrDrawPathBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDrawPathBatch.h"
 
 SkString GrDrawPathBatch::dumpInfo() const {
@@ skipping 38 matching lines @@
         // Double check that it is in fact winding.
         SkASSERT(kIncClamp_StencilOp == this->stencilSettings().passOp(pathFace));
         SkASSERT(kIncClamp_StencilOp == this->stencilSettings().failOp(pathFace));
         SkASSERT(0x1 != this->stencilSettings().writeMask(pathFace));
         SkASSERT(!this->stencilSettings().isTwoSided());
     }
     return isWinding;
 }
 
 GrDrawPathRangeBatch::GrDrawPathRangeBatch(const SkMatrix& viewMatrix, const SkMatrix& localMatrix,
-                                           GrColor color, GrPathRangeDraw* pathRangeDraw)
+                                           GrColor color, GrPathRange* range, GrPathRangeDraw* draw)
     : INHERITED(ClassID(), viewMatrix, color)
+    , fPathRange(range)
     , fDraws(4)
     , fLocalMatrix(localMatrix) {
-    SkDEBUGCODE(pathRangeDraw->fUsedInBatch = true;)
-    fDraws.addToHead(SkRef(pathRangeDraw));
-    fTotalPathCount = pathRangeDraw->count();
+    SkDEBUGCODE(draw->fUsedInBatch = true;)
+    fDraws.addToHead(SkRef(draw));
+    fTotalPathCount = draw->count();
     // Don't compute a bounding box. For dst copy texture, we'll opt instead for it to just copy
     // the entire dst. Realistically this is a moot point, because any context that supports
     // NV_path_rendering will also support NV_blend_equation_advanced.
     // For clipping we'll just skip any optimizations based on the bounds.
     fBounds.setLargest();
 }
 
 bool GrDrawPathRangeBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
     GrDrawPathRangeBatch* that = t->cast<GrDrawPathRangeBatch>();
+    if (this->fPathRange.get() != that->fPathRange.get()) {
+        return false;
+    }
     if (!GrPathRangeDraw::CanMerge(**this->fDraws.head(), **that->fDraws.head())) {
         return false;
     }
     if (!GrPipeline::AreEqual(*this->pipeline(), *that->pipeline(), false)) {
         return false;
     }
     if (this->color() != that->color() ||
         !this->viewMatrix().cheapEqualTo(that->viewMatrix()) ||
         !fLocalMatrix.cheapEqualTo(that->fLocalMatrix)) {
         return false;
@@ skipping 24 matching lines @@
     GrProgramDesc  desc;
     SkAutoTUnref<GrPathProcessor> pathProc(GrPathProcessor::Create(this->color(),
                                                                    this->opts(),
                                                                    this->viewMatrix(),
                                                                    fLocalMatrix));
     state->gpu()->buildProgramDesc(&desc, *pathProc, *this->pipeline());
     GrPathRendering::DrawPathArgs args(pathProc, this->pipeline(),
                                         &desc, &this->stencilSettings());
     if (fDraws.count() == 1) {
         const GrPathRangeDraw& draw = **fDraws.head();
-        state->gpu()->pathRendering()->drawPaths(args, draw.range(), draw.indices(),
+        state->gpu()->pathRendering()->drawPaths(args, fPathRange.get(), draw.indices(),
             GrPathRange::kU16_PathIndexType, draw.transforms(), draw.transformType(),
             draw.count());
         return;
     }
 
-    const GrPathRange* range = (*fDraws.head())->range();
     GrPathRendering::PathTransformType transformType = (*fDraws.head())->transformType();
     int floatsPerTransform = GrPathRendering::PathTransformSize(transformType);
     SkAutoSTMalloc<512, float> transformStorage(floatsPerTransform * fTotalPathCount);
     SkAutoSTMalloc<256, uint16_t> indexStorage(fTotalPathCount);
     uint16_t* indices = indexStorage.get();
     float* transforms = transformStorage.get();
     for (DrawList::Iter iter(fDraws); iter.get(); iter.next()) {
         SkASSERT((*iter.get())->transformType() == transformType);
-        SkASSERT((*iter.get())->range() == range);
         int cnt = (*iter.get())->count();
         memcpy(indices, (*iter.get())->indices(), cnt * sizeof(uint16_t));
         indices += cnt;
         memcpy(transforms, (*iter.get())->transforms(), cnt * floatsPerTransform * sizeof(float));
         transforms += cnt * floatsPerTransform;
     }
     SkASSERT(indices - indexStorage.get() == fTotalPathCount);
-    state->gpu()->pathRendering()->drawPaths(args, range, indexStorage.get(),
+    state->gpu()->pathRendering()->drawPaths(args, fPathRange.get(), indexStorage.get(),
         GrPathRange::kU16_PathIndexType, transformStorage.get(), transformType,
         fTotalPathCount);
 }