commit 8585dd26bf74edf26a1cd1c31699c03347f78937
author cdalton <cdalton@nvidia.com> Thu Oct 08 08:04:09 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Oct 08 08:04:09 2015 -0700
tree be4baed1d1289b42fd39480b71bd9376782c8523
parent bf90520f63415f539cd5792a18efbd79cb86be0a

Updates nvpr text blobs to not store a direct reference to the
per-glyph GPU path object, but rather store a key for looking it up in
the resource cache. This allows the cache to purge glyphs when needed.
Also indirectly fixes a memory leak that was introduced with nvpr text
blobs.

BUG=skia:

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

src/gpu/batches/GrDrawPathBatch.h

diff --git a/src/gpu/batches/GrDrawPathBatch.h b/src/gpu/batches/GrDrawPathBatch.h
index 91e0e41..d6d0711 100644
--- a/src/gpu/batches/GrDrawPathBatch.h
+++ b/src/gpu/batches/GrDrawPathBatch.h
@@ -95,9 +95,8 @@
 public:
     typedef GrPathRendering::PathTransformType TransformType;
 
-    static GrPathRangeDraw* Create(GrPathRange* range, TransformType transformType,
-        int reserveCnt) {
-        return new GrPathRangeDraw(range, transformType, reserveCnt);
+    static GrPathRangeDraw* Create(TransformType transformType, int reserveCnt) {
+        return new GrPathRangeDraw(transformType, reserveCnt);
     }
 
     void append(uint16_t index, float transform[]) {
@@ -113,20 +112,13 @@
 
     const uint16_t* indices() const { return fIndices.begin(); }
 
-    const GrPathRange* range() const { return fPathRange.get(); }
-
-    void loadGlyphPathsIfNeeded() {
-        fPathRange.get()->loadPathsIfNeeded<uint16_t>(fIndices.begin(), fIndices.count());
-    }
-
     static bool CanMerge(const GrPathRangeDraw& a, const GrPathRangeDraw& b) {
-        return a.transformType() == b.transformType() && a.range() == b.range();
+        return a.transformType() == b.transformType();
     }
 
 private:
-    GrPathRangeDraw(GrPathRange* range, TransformType transformType, int reserveCnt)
-        : fPathRange(range)
-        , fTransformType(transformType)
+    GrPathRangeDraw(TransformType transformType, int reserveCnt)
+        : fTransformType(transformType)
         , fIndices(reserveCnt)
         , fTransforms(reserveCnt * GrPathRendering::PathTransformSize(transformType)) {
         SkDEBUGCODE(fUsedInBatch = false;)
@@ -136,7 +128,6 @@
     static const int kIndexReserveCnt = 64;
     static const int kTransformBufferReserveCnt = 2 * 64;
 
-    GrPendingIOResource<const GrPathRange, kRead_GrIOType> fPathRange;
     GrPathRendering::PathTransformType                     fTransformType;
     SkSTArray<kIndexReserveCnt, uint16_t, true>            fIndices;
     SkSTArray<kTransformBufferReserveCnt, float, true>     fTransforms;
@@ -157,8 +148,8 @@
 
     // This can't return a more abstract type because we install the stencil settings late :(
     static GrDrawPathBatchBase* Create(const SkMatrix& viewMatrix, const SkMatrix& localMatrix,
-                                       GrColor color, GrPathRangeDraw* pathRangeDraw) {
-        return new GrDrawPathRangeBatch(viewMatrix, localMatrix, color, pathRangeDraw);
+                                       GrColor color, GrPathRange* range, GrPathRangeDraw* draw) {
+        return new GrDrawPathRangeBatch(viewMatrix, localMatrix, color, range, draw);
     }
 
     ~GrDrawPathRangeBatch() override;
@@ -171,7 +162,7 @@
     inline bool isWinding() const;
 
     GrDrawPathRangeBatch(const SkMatrix& viewMatrix, const SkMatrix& localMatrix, GrColor color,
-                         GrPathRangeDraw* pathRangeDraw);
+                         GrPathRange* range, GrPathRangeDraw* draw);
 
     bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override;
 
@@ -179,10 +170,12 @@
 
     void onDraw(GrBatchFlushState* state) override;
 
+    typedef GrPendingIOResource<const GrPathRange, kRead_GrIOType> PendingPathRange;
     typedef SkTLList<GrPathRangeDraw*> DrawList;
-    DrawList    fDraws;
-    int         fTotalPathCount;
-    SkMatrix    fLocalMatrix;
+    PendingPathRange    fPathRange;
+    DrawList            fDraws;
+    int                 fTotalPathCount;
+    SkMatrix            fLocalMatrix;
 
     typedef GrDrawPathBatchBase INHERITED;
 };