diff options
| author |  joshualitt <joshualitt@google.com> | 2015-09-17 11:43:01 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-17 11:43:02 -0700 |
| commit | a7008403dcd03302e88e2df546d8427afe9e0e80 (patch) | |
| tree | 5bce1f3fd012c399e17401605e3d9f5dcba53169 /src/gpu/batches/GrAADistanceFieldPathRenderer.cpp | |
| parent | 4078d529e9e199eea13456db7bf3a63a104ab5b9 (diff) | |
Revert of add a ClassID function to GrBatch (patchset #5 id:80001 of https://codereview.chromium.org/1352813003/ )
Reason for revert:
breaks mac bot
Original issue's description:
> add a ClassID function to GrBatch
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4078d529e9e199eea13456db7bf3a63a104ab5b9
TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1345393003
Diffstat (limited to 'src/gpu/batches/GrAADistanceFieldPathRenderer.cpp')
| -rw-r--r-- | src/gpu/batches/GrAADistanceFieldPathRenderer.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp b/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp index ee5fdb8a80..f06553c2d8 100644 --- a/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp +++ b/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp @@ -111,8 +111,6 @@ 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; @@ -278,8 +276,8 @@ private: 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 @@ private: GrBatchAtlas* fAtlas; PathCache* fPathCache; PathDataList* fPathList; - - typedef GrVertexBatch INHERITED; }; bool GrAADistanceFieldPathRenderer::onDrawPath(const DrawPathArgs& args) { |