Remove style application from GrPathRenderer subclasses

src/gpu/batches/GrAADistanceFieldPathRenderer.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAADistanceFieldPathRenderer.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 13 matching lines @@
 
 #define ATLAS_TEXTURE_WIDTH 2048
 #define ATLAS_TEXTURE_HEIGHT 2048
 #define PLOT_WIDTH  512
 #define PLOT_HEIGHT 256
 
 #define NUM_PLOTS_X   (ATLAS_TEXTURE_WIDTH / PLOT_WIDTH)
 #define NUM_PLOTS_Y   (ATLAS_TEXTURE_HEIGHT / PLOT_HEIGHT)
 
 #ifdef DF_PATH_TRACKING
-static int g_NumCachedPaths = 0;
-static int g_NumFreedPaths = 0;
+static int g_NumCachedShapes = 0;
+static int g_NumFreedShapes = 0;
 #endif
 
 // mip levels
 static const int kSmallMIP = 32;
 static const int kMediumMIP = 73;
 static const int kLargeMIP = 162;
 
 // Callback to clear out internal path cache when eviction occurs
 void GrAADistanceFieldPathRenderer::HandleEviction(GrBatchAtlas::AtlasID id, void* pr) {
     GrAADistanceFieldPathRenderer* dfpr = (GrAADistanceFieldPathRenderer*)pr;
     // remove any paths that use this plot
-    PathDataList::Iter iter;
-    iter.init(dfpr->fPathList, PathDataList::Iter::kHead_IterStart);
-    PathData* pathData;
-    while ((pathData = iter.get())) {
+    ShapeDataList::Iter iter;
+    iter.init(dfpr->fShapeList, ShapeDataList::Iter::kHead_IterStart);
+    ShapeData* shapeData;
+    while ((shapeData = iter.get())) {
         iter.next();
-        if (id == pathData->fID) {
-            dfpr->fPathCache.remove(pathData->fKey);
-            dfpr->fPathList.remove(pathData);
-            delete pathData;
+        if (id == shapeData->fID) {
+            dfpr->fShapeCache.remove(shapeData->fKey);
+            dfpr->fShapeList.remove(shapeData);
+            delete shapeData;
 #ifdef DF_PATH_TRACKING
             ++g_NumFreedPaths;
 #endif
         }
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 GrAADistanceFieldPathRenderer::GrAADistanceFieldPathRenderer() : fAtlas(nullptr) {}
 
 GrAADistanceFieldPathRenderer::~GrAADistanceFieldPathRenderer() {
-    PathDataList::Iter iter;
-    iter.init(fPathList, PathDataList::Iter::kHead_IterStart);
-    PathData* pathData;
-    while ((pathData = iter.get())) {
+    ShapeDataList::Iter iter;
+    iter.init(fShapeList, ShapeDataList::Iter::kHead_IterStart);
+    ShapeData* shapeData;
+    while ((shapeData = iter.get())) {
         iter.next();
-        fPathList.remove(pathData);
-        delete pathData;
+        fShapeList.remove(shapeData);
+        delete shapeData;
     }
     delete fAtlas;
 
 #ifdef DF_PATH_TRACKING
-    SkDebugf("Cached paths: %d, freed paths: %d\n", g_NumCachedPaths, g_NumFreedPaths);
+    SkDebugf("Cached shapes: %d, freed shapes: %d\n", g_NumCachedShapes, g_NumFreedShapes);
 #endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 bool GrAADistanceFieldPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
-    // We don't currently apply the dash or factor it into the DF key. (skbug.com/5082)
-    if (args.fShape->style().pathEffect()) {
+    if (!args.fShaderCaps->shaderDerivativeSupport()) {
         return false;
     }
+    // If the shape has no key then we won't get any reuse.
+    if (!args.fShape->hasUnstyledKey()) {
+        return false;
+    }
+    if (args.fShape->style().applies()) {
+        // This may come back around after the style has been applied.
+        return false;
+    }
+    // This does non-inverse antialiased fills.
     // TODO: Support inverse fill
-    if (!args.fShaderCaps->shaderDerivativeSupport() || !args.fAntiAlias ||
-        args.fShape->style().isSimpleHairline() || args.fShape->mayBeInverseFilledAfterStyling() ||
-        !args.fShape->hasUnstyledKey()) {
+    if (!args.fAntiAlias || !args.fShape->style().isSimpleFill() ||args.fShape->inverseFilled()) {

[egdaniel, 2016/06/27 13:16:58]

space after ||

[bsalomon, 2016/06/27 13:37:52]

Done.

         return false;
     }
 
     // currently don't support perspective
     if (args.fViewMatrix->hasPerspective()) {
         return false;
     }
 
     // only support paths with bounds within kMediumMIP by kMediumMIP,
     // scaled to have bounds within 2.0f*kLargeMIP by 2.0f*kLargeMIP
     // the goal is to accelerate rendering of lots of small paths that may be scaling
     SkScalar maxScale = args.fViewMatrix->getMaxScale();
     SkRect bounds;
     args.fShape->styledBounds(&bounds);
     SkScalar maxDim = SkMaxScalar(bounds.width(), bounds.height());
 
     return maxDim <= kMediumMIP && maxDim * maxScale <= 2.0f*kLargeMIP;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // padding around path bounds to allow for antialiased pixels
 static const SkScalar kAntiAliasPad = 1.0f;
 
 class AADistanceFieldPathBatch : public GrVertexBatch {
 public:
     DEFINE_BATCH_CLASS_ID
 
-    typedef GrAADistanceFieldPathRenderer::PathData PathData;
-    typedef SkTDynamicHash<PathData, PathData::Key> PathCache;
-    typedef GrAADistanceFieldPathRenderer::PathDataList PathDataList;
+    typedef GrAADistanceFieldPathRenderer::ShapeData ShapeData;
+    typedef SkTDynamicHash<ShapeData, ShapeData::Key> ShapeCache;
+    typedef GrAADistanceFieldPathRenderer::ShapeDataList ShapeDataList;
 
     struct Geometry {
-        Geometry(const SkStrokeRec& stroke) : fStroke(stroke) {
-            if (!stroke.needToApply()) {
-                // purify unused values to ensure binary equality
-                fStroke.setStrokeParams(SkPaint::kDefault_Cap, SkPaint::kDefault_Join,
-                                        SkIntToScalar(4));
-                if (fStroke.getWidth() < 0) {
-                    fStroke.setStrokeStyle(-1.0f);
-                }
-            }
-        }
-        SkPath fPath;
-        // The unique ID of the path involved in this draw. This may be different than the ID
-        // in fPath since that path may have resulted from a SkStrokeRec::applyToPath call.
-        uint32_t fGenID;
-        SkStrokeRec fStroke;
+        GrShape fShape;
         GrColor fColor;
         bool fAntiAlias;
     };
 
     static GrDrawBatch* Create(const Geometry& geometry, const SkMatrix& viewMatrix,
-                               GrBatchAtlas* atlas, PathCache* pathCache, PathDataList* pathList,
-                               bool gammaCorrect) {
-        return new AADistanceFieldPathBatch(geometry, viewMatrix, atlas, pathCache, pathList,
+                               GrBatchAtlas* atlas, ShapeCache* shapeCache,
+                               ShapeDataList* shapeList, bool gammaCorrect) {
+        return new AADistanceFieldPathBatch(geometry, viewMatrix, atlas, shapeCache, shapeList,
                                             gammaCorrect);
     }
 
     const char* name() const override { return "AADistanceFieldPathBatch"; }
 
     void computePipelineOptimizations(GrInitInvariantOutput* color,
                                       GrInitInvariantOutput* coverage,
                                       GrBatchToXPOverrides* overrides) const override {
         color->setKnownFourComponents(fGeoData[0].fColor);
         coverage->setUnknownSingleComponent();
@@ skipping 64 matching lines @@
             SkDebugf("Could not allocate vertices\n");
             return;
         }
 
         flushInfo.fInstancesToFlush = 0;
         for (int i = 0; i < instanceCount; i++) {
             const Geometry& args = fGeoData[i];
 
             // get mip level
             SkScalar maxScale = this->viewMatrix().getMaxScale();
-            const SkRect& bounds = args.fPath.getBounds();
+            const SkRect& bounds = args.fShape.bounds();
             SkScalar maxDim = SkMaxScalar(bounds.width(), bounds.height());
             SkScalar size = maxScale * maxDim;
             uint32_t desiredDimension;
             if (size <= kSmallMIP) {
                 desiredDimension = kSmallMIP;
             } else if (size <= kMediumMIP) {
                 desiredDimension = kMediumMIP;
             } else {
                 desiredDimension = kLargeMIP;
             }
 
             // check to see if path is cached
-            PathData::Key key(args.fGenID, desiredDimension, args.fStroke);
-            PathData* pathData = fPathCache->find(key);
-            if (nullptr == pathData || !atlas->hasID(pathData->fID)) {
+            ShapeData::Key key(args.fShape, desiredDimension);
+            ShapeData* shapeData = fShapeCache->find(key);
+            if (nullptr == shapeData || !atlas->hasID(shapeData->fID)) {
                 // Remove the stale cache entry
-                if (pathData) {
-                    fPathCache->remove(pathData->fKey);
-                    fPathList->remove(pathData);
-                    delete pathData;
+                if (shapeData) {
+                    fShapeCache->remove(shapeData->fKey);
+                    fShapeList->remove(shapeData);
+                    delete shapeData;
                 }
                 SkScalar scale = desiredDimension/maxDim;
-                pathData = new PathData;
+                shapeData = new ShapeData;
                 if (!this->addPathToAtlas(target,
                                           &flushInfo,
                                           atlas,
-                                          pathData,
-                                          args.fPath,
-                                          args.fGenID,
-                                          args.fStroke,
+                                          shapeData,
+                                          args.fShape,
                                           args.fAntiAlias,
                                           desiredDimension,
                                           scale)) {
                     SkDebugf("Can't rasterize path\n");
                     return;
                 }
             }
 
-            atlas->setLastUseToken(pathData->fID, target->nextDrawToken());
+            atlas->setLastUseToken(shapeData->fID, target->nextDrawToken());
 
             // Now set vertices
             intptr_t offset = reinterpret_cast<intptr_t>(vertices);
             offset += i * kVerticesPerQuad * vertexStride;
             this->writePathVertices(target,
                                     atlas,
                                     offset,
                                     args.fColor,
                                     vertexStride,
                                     this->viewMatrix(),
-                                    args.fPath,
-                                    pathData);
+                                    args.fShape,
+                                    shapeData);
             flushInfo.fInstancesToFlush++;
         }
 
         this->flush(target, &flushInfo);
     }
 
-    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
-
     AADistanceFieldPathBatch(const Geometry& geometry,
                              const SkMatrix& viewMatrix,
                              GrBatchAtlas* atlas,
-                             PathCache* pathCache, PathDataList* pathList,
+                             ShapeCache* shapeCache, ShapeDataList* shapeList,
                              bool gammaCorrect)
         : INHERITED(ClassID()) {
+        SkASSERT(geometry.fShape.hasUnstyledKey());
         fBatch.fViewMatrix = viewMatrix;
         fGeoData.push_back(geometry);
+        SkASSERT(fGeoData[0].fShape.hasUnstyledKey());
 
         fAtlas = atlas;
-        fPathCache = pathCache;
-        fPathList = pathList;
+        fShapeCache = shapeCache;
+        fShapeList = shapeList;
         fGammaCorrect = gammaCorrect;
 
         // Compute bounds
-        fBounds = geometry.fPath.getBounds();
+        fBounds = geometry.fShape.bounds();
         viewMatrix.mapRect(&fBounds);
     }
 
     bool addPathToAtlas(GrVertexBatch::Target* target,
                         FlushInfo* flushInfo,
                         GrBatchAtlas* atlas,
-                        PathData* pathData,
-                        const SkPath& path,
-                        uint32_t genID,
-                        const SkStrokeRec& stroke,
+                        ShapeData* shapeData,
+                        const GrShape& shape,
                         bool antiAlias,
                         uint32_t dimension,
                         SkScalar scale) const {
-        const SkRect& bounds = path.getBounds();
+        const SkRect& bounds = shape.bounds();
 
         // generate bounding rect for bitmap draw
         SkRect scaledBounds = bounds;
         // scale to mip level size
         scaledBounds.fLeft *= scale;
         scaledBounds.fTop *= scale;
         scaledBounds.fRight *= scale;
         scaledBounds.fBottom *= scale;
         // move the origin to an integer boundary (gives better results)
         SkScalar dx = SkScalarFraction(scaledBounds.fLeft);
@@ skipping 36 matching lines @@
 
         SkDraw draw;
         sk_bzero(&draw, sizeof(draw));
 
         SkRasterClip rasterClip;
         rasterClip.setRect(devPathBounds);
         draw.fRC = &rasterClip;
         draw.fMatrix = &drawMatrix;
         draw.fDst = dst;
 
+        SkPath path;
+        shape.asPath(&path);
         draw.drawPathCoverage(path, paint);
 
         // generate signed distance field
         devPathBounds.outset(SK_DistanceFieldPad, SK_DistanceFieldPad);
         width = devPathBounds.width();
         height = devPathBounds.height();
         // TODO We should really generate this directly into the plot somehow
         SkAutoSMalloc<1024> dfStorage(width * height * sizeof(unsigned char));
 
         // Generate signed distance field
         SkGenerateDistanceFieldFromA8Image((unsigned char*)dfStorage.get(),
                                            (const unsigned char*)dst.addr(),
                                            dst.width(), dst.height(), dst.rowBytes());
 
         // add to atlas
         SkIPoint16 atlasLocation;
         GrBatchAtlas::AtlasID id;
         bool success = atlas->addToAtlas(&id, target, width, height, dfStorage.get(),
                                          &atlasLocation);
         if (!success) {
             this->flush(target, flushInfo);
 
             SkDEBUGCODE(success =) atlas->addToAtlas(&id, target, width, height,
                                                      dfStorage.get(), &atlasLocation);
             SkASSERT(success);
 
         }
 
         // add to cache
-        pathData->fKey = PathData::Key(genID, dimension, stroke);
-        pathData->fScale = scale;
-        pathData->fID = id;
+        shapeData->fKey.set(shape, dimension);
+        shapeData->fScale = scale;
+        shapeData->fID = id;
         // change the scaled rect to match the size of the inset distance field
         scaledBounds.fRight = scaledBounds.fLeft +
             SkIntToScalar(devPathBounds.width() - 2*SK_DistanceFieldInset);
         scaledBounds.fBottom = scaledBounds.fTop +
             SkIntToScalar(devPathBounds.height() - 2*SK_DistanceFieldInset);
         // shift the origin to the correct place relative to the distance field
         // need to also restore the fractional translation
         scaledBounds.offset(-SkIntToScalar(SK_DistanceFieldInset) - kAntiAliasPad + dx,
                             -SkIntToScalar(SK_DistanceFieldInset) - kAntiAliasPad + dy);
-        pathData->fBounds = scaledBounds;
+        shapeData->fBounds = scaledBounds;
         // origin we render from is inset from distance field edge
         atlasLocation.fX += SK_DistanceFieldInset;
         atlasLocation.fY += SK_DistanceFieldInset;
-        pathData->fAtlasLocation = atlasLocation;
+        shapeData->fAtlasLocation = atlasLocation;
 
-        fPathCache->add(pathData);
-        fPathList->addToTail(pathData);
+        fShapeCache->add(shapeData);
+        fShapeList->addToTail(shapeData);
 #ifdef DF_PATH_TRACKING
         ++g_NumCachedPaths;
 #endif
         return true;
     }
 
     void writePathVertices(GrDrawBatch::Target* target,
                            GrBatchAtlas* atlas,
                            intptr_t offset,
                            GrColor color,
                            size_t vertexStride,
                            const SkMatrix& viewMatrix,
-                           const SkPath& path,
-                           const PathData* pathData) const {
+                           const GrShape& shape,
+                           const ShapeData* shapeData) const {
         GrTexture* texture = atlas->getTexture();
 
-        SkScalar dx = pathData->fBounds.fLeft;
-        SkScalar dy = pathData->fBounds.fTop;
-        SkScalar width = pathData->fBounds.width();
-        SkScalar height = pathData->fBounds.height();
+        SkScalar dx = shapeData->fBounds.fLeft;
+        SkScalar dy = shapeData->fBounds.fTop;
+        SkScalar width = shapeData->fBounds.width();
+        SkScalar height = shapeData->fBounds.height();
 
-        SkScalar invScale = 1.0f / pathData->fScale;
+        SkScalar invScale = 1.0f / shapeData->fScale;
         dx *= invScale;
         dy *= invScale;
         width *= invScale;
         height *= invScale;
 
         SkPoint* positions = reinterpret_cast<SkPoint*>(offset);
 
         // vertex positions
         // TODO make the vertex attributes a struct
         SkRect r = SkRect::MakeXYWH(dx, dy, width, height);
         positions->setRectFan(r.left(), r.top(), r.right(), r.bottom(), vertexStride);
 
         // colors
         for (int i = 0; i < kVerticesPerQuad; i++) {
             GrColor* colorPtr = (GrColor*)(offset + sizeof(SkPoint) + i * vertexStride);
             *colorPtr = color;
         }
 
-        const SkScalar tx = SkIntToScalar(pathData->fAtlasLocation.fX);
-        const SkScalar ty = SkIntToScalar(pathData->fAtlasLocation.fY);
+        const SkScalar tx = SkIntToScalar(shapeData->fAtlasLocation.fX);
+        const SkScalar ty = SkIntToScalar(shapeData->fAtlasLocation.fY);
 
         // vertex texture coords
         SkPoint* textureCoords = (SkPoint*)(offset + sizeof(SkPoint) + sizeof(GrColor));
         textureCoords->setRectFan(tx / texture->width(),
                                   ty / texture->height(),
-                                  (tx + pathData->fBounds.width()) / texture->width(),
-                                  (ty + pathData->fBounds.height())  / texture->height(),
+                                  (tx + shapeData->fBounds.width()) / texture->width(),
+                                  (ty + shapeData->fBounds.height())  / texture->height(),
                                   vertexStride);
     }
 
     void flush(GrVertexBatch::Target* target, FlushInfo* flushInfo) const {
         GrMesh mesh;
         int maxInstancesPerDraw =
             static_cast<int>(flushInfo->fIndexBuffer->gpuMemorySize() / sizeof(uint16_t) / 6);
         mesh.initInstanced(kTriangles_GrPrimitiveType, flushInfo->fVertexBuffer,
             flushInfo->fIndexBuffer, flushInfo->fVertexOffset, kVerticesPerQuad,
             kIndicesPerQuad, flushInfo->fInstancesToFlush, maxInstancesPerDraw);
@@ skipping 11 matching lines @@
         if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
                                     that->bounds(), caps)) {
             return false;
         }
 
         // TODO We can position on the cpu
         if (!this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
             return false;
         }
 
-        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        fGeoData.push_back_n(that->fGeoData.count(), that->fGeoData.begin());
         this->joinBounds(that->bounds());
         return true;
     }
 
     struct BatchTracker {
         SkMatrix fViewMatrix;
         bool fUsesLocalCoords;
         bool fColorIgnored;
         bool fCoverageIgnored;
     };
 
     BatchTracker fBatch;
-    SkSTArray<1, Geometry, true> fGeoData;
+    SkSTArray<1, Geometry> fGeoData;
     GrBatchAtlas* fAtlas;
-    PathCache* fPathCache;
-    PathDataList* fPathList;
+    ShapeCache* fShapeCache;
+    ShapeDataList* fShapeList;
     bool fGammaCorrect;
 
     typedef GrVertexBatch INHERITED;
 };
 
 bool GrAADistanceFieldPathRenderer::onDrawPath(const DrawPathArgs& args) {
     GR_AUDIT_TRAIL_AUTO_FRAME(args.fDrawContext->auditTrail(),
                               "GrAADistanceFieldPathRenderer::onDrawPath");
     SkASSERT(!args.fDrawContext->isUnifiedMultisampled());
 
     // we've already bailed on inverse filled paths, so this is safe
     SkASSERT(!args.fShape->isEmpty());
-
+    SkASSERT(args.fShape->hasUnstyledKey());
     if (!fAtlas) {
         fAtlas = args.fResourceProvider->createAtlas(kAlpha_8_GrPixelConfig,
                                                      ATLAS_TEXTURE_WIDTH, ATLAS_TEXTURE_HEIGHT,
                                                      NUM_PLOTS_X, NUM_PLOTS_Y,
                                                      &GrAADistanceFieldPathRenderer::HandleEviction,
                                                      (void*)this);
         if (!fAtlas) {
             return false;
         }
     }
 
-    const GrStyle& style = args.fShape->style();
-    // It's ok to ignore style's path effect because canDrawPath filtered out path effects.
-    AADistanceFieldPathBatch::Geometry geometry(style.strokeRec());
-    args.fShape->asPath(&geometry.fPath);
-    // Note: this is the generation ID of the _original_ path. When a new path is
-    // generated due to stroking it is important that the original path's id is used
-    // for caching.
-    geometry.fGenID = geometry.fPath.getGenerationID();
-    if (!style.isSimpleFill()) {
-        style.strokeRec().applyToPath(&geometry.fPath, geometry.fPath);
-    }
+    AADistanceFieldPathBatch::Geometry geometry;
+    geometry.fShape = *args.fShape;
     geometry.fColor = args.fColor;
     geometry.fAntiAlias = args.fAntiAlias;
 
     SkAutoTUnref<GrDrawBatch> batch(AADistanceFieldPathBatch::Create(geometry,
                                                                      *args.fViewMatrix, fAtlas,
-                                                                     &fPathCache, &fPathList,
+                                                                     &fShapeCache, &fShapeList,
                                                                      args.fGammaCorrect));
 
     GrPipelineBuilder pipelineBuilder(*args.fPaint);
     pipelineBuilder.setUserStencil(args.fUserStencilSettings);
 
     args.fDrawContext->drawBatch(pipelineBuilder, *args.fClip, batch);
 
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef GR_TEST_UTILS
 
 struct PathTestStruct {
-    typedef GrAADistanceFieldPathRenderer::PathCache PathCache;
-    typedef GrAADistanceFieldPathRenderer::PathData PathData;
-    typedef GrAADistanceFieldPathRenderer::PathDataList PathDataList;
+    typedef GrAADistanceFieldPathRenderer::ShapeCache ShapeCache;
+    typedef GrAADistanceFieldPathRenderer::ShapeData ShapeData;
+    typedef GrAADistanceFieldPathRenderer::ShapeDataList ShapeDataList;
     PathTestStruct() : fContextID(SK_InvalidGenID), fAtlas(nullptr) {}
     ~PathTestStruct() { this->reset(); }
 
     void reset() {
-        PathDataList::Iter iter;
-        iter.init(fPathList, PathDataList::Iter::kHead_IterStart);
-        PathData* pathData;
-        while ((pathData = iter.get())) {
+        ShapeDataList::Iter iter;
+        iter.init(fShapeList, ShapeDataList::Iter::kHead_IterStart);
+        ShapeData* shapeData;
+        while ((shapeData = iter.get())) {
             iter.next();
-            fPathList.remove(pathData);
-            delete pathData;
+            fShapeList.remove(shapeData);
+            delete shapeData;
         }
         delete fAtlas;
-        fPathCache.reset();
+        fShapeCache.reset();
     }
 
     static void HandleEviction(GrBatchAtlas::AtlasID id, void* pr) {
         PathTestStruct* dfpr = (PathTestStruct*)pr;
         // remove any paths that use this plot
-        PathDataList::Iter iter;
-        iter.init(dfpr->fPathList, PathDataList::Iter::kHead_IterStart);
-        PathData* pathData;
-        while ((pathData = iter.get())) {
+        ShapeDataList::Iter iter;
+        iter.init(dfpr->fShapeList, ShapeDataList::Iter::kHead_IterStart);
+        ShapeData* shapeData;
+        while ((shapeData = iter.get())) {
             iter.next();
-            if (id == pathData->fID) {
-                dfpr->fPathCache.remove(pathData->fKey);
-                dfpr->fPathList.remove(pathData);
-                delete pathData;
+            if (id == shapeData->fID) {
+                dfpr->fShapeCache.remove(shapeData->fKey);
+                dfpr->fShapeList.remove(shapeData);
+                delete shapeData;
             }
         }
     }
 
     uint32_t fContextID;
     GrBatchAtlas* fAtlas;
-    PathCache fPathCache;
-    PathDataList fPathList;
+    ShapeCache fShapeCache;
+    ShapeDataList fShapeList;
 };
 
 DRAW_BATCH_TEST_DEFINE(AADistanceFieldPathBatch) {
     static PathTestStruct gTestStruct;
 
     if (context->uniqueID() != gTestStruct.fContextID) {
         gTestStruct.fContextID = context->uniqueID();
         gTestStruct.reset();
         gTestStruct.fAtlas =
                 context->resourceProvider()->createAtlas(kAlpha_8_GrPixelConfig,
                                                      ATLAS_TEXTURE_WIDTH, ATLAS_TEXTURE_HEIGHT,
                                                      NUM_PLOTS_X, NUM_PLOTS_Y,
                                                      &PathTestStruct::HandleEviction,
                                                      (void*)&gTestStruct);
     }
 
     SkMatrix viewMatrix = GrTest::TestMatrix(random);
     GrColor color = GrRandomColor(random);
     bool gammaCorrect = random->nextBool();
 
-    AADistanceFieldPathBatch::Geometry geometry(GrTest::TestStrokeRec(random));
+    AADistanceFieldPathBatch::Geometry geometry;
+    SkStrokeRec strokeRec = GrTest::TestStrokeRec(random);
+    GrShape shape(GrTest::TestPath(random), GrStyle(strokeRec, nullptr));
+    geometry.fShape = shape;
     geometry.fColor = color;
-    geometry.fPath = GrTest::TestPath(random);
     geometry.fAntiAlias = random->nextBool();
-    geometry.fGenID = random->nextU();
 
     return AADistanceFieldPathBatch::Create(geometry, viewMatrix,
                                             gTestStruct.fAtlas,
-                                            &gTestStruct.fPathCache,
-                                            &gTestStruct.fPathList,
+                                            &gTestStruct.fShapeCache,
+                                            &gTestStruct.fShapeList,
                                             gammaCorrect);
 }
 
 #endif