| Index: src/gpu/batches/GrAADistanceFieldPathRenderer.cpp
|
| diff --git a/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp b/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp
|
| index ee5fdb8a804f23fc88d88e4c96e8d02542fdb866..f06553c2d8e069b13fe483f06e35e3734fb1ea6a 100644
|
| --- a/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp
|
| +++ b/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp
|
| @@ -111,8 +111,6 @@
|
|
|
| class AADistanceFieldPathBatch : public GrVertexBatch {
|
| public:
|
| - DEFINE_BATCH_CLASS_ID
|
| -
|
| typedef GrAADistanceFieldPathRenderer::PathData PathData;
|
| typedef SkTDynamicHash<PathData, PathData::Key> PathCache;
|
| typedef GrAADistanceFieldPathRenderer::PathDataList PathDataList;
|
| @@ -278,8 +276,8 @@
|
|
|
| AADistanceFieldPathBatch(const Geometry& geometry, GrColor color, const SkMatrix& viewMatrix,
|
| GrBatchAtlas* atlas,
|
| - PathCache* pathCache, PathDataList* pathList)
|
| - : INHERITED(ClassID()) {
|
| + PathCache* pathCache, PathDataList* pathList) {
|
| + this->initClassID<AADistanceFieldPathBatch>();
|
| fBatch.fColor = color;
|
| fBatch.fViewMatrix = viewMatrix;
|
| fGeoData.push_back(geometry);
|
| @@ -521,8 +519,6 @@
|
| GrBatchAtlas* fAtlas;
|
| PathCache* fPathCache;
|
| PathDataList* fPathList;
|
| -
|
| - typedef GrVertexBatch INHERITED;
|
| };
|
|
|
| bool GrAADistanceFieldPathRenderer::onDrawPath(const DrawPathArgs& args) {
|
|
|