diff options
| author |  reed <reed@chromium.org> | 2015-09-17 20:16:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-17 20:16:13 -0700 |
| commit | 1b55a963a2374a14bb82eb887bb99ee91680f0eb (patch) | |
| tree | a15774af26154d677a16d718ba52d7a401bfa868 /src/gpu/batches/GrAADistanceFieldPathRenderer.cpp | |
| parent | 48e3a45ade15c52c0c1a10cb00907dd444897745 (diff) | |
Reland of add a ClassID function to GrBatch (patchset #1 id:1 of https://codereview.chromium.org/1353043002/ )
Reason for revert:
DEPS roll seems to have landed w/o this revert, so revert it again
Original issue's description:
> Revert of add a ClassID function to GrBatch (patchset #5 id:80001 of https://codereview.chromium.org/1352813003/ )
>
> Reason for revert:
> Speculative revert to unblock DEPS roll
>
> Original issue's description:
> > add a ClassID function to GrBatch
> >
> > BUG=skia:
> >
> > Committed: https://skia.googlesource.com/skia/+/4078d529e9e199eea13456db7bf3a63a104ab5b9
> >
> > Committed: https://skia.googlesource.com/skia/+/eb44d53cf96a7eaf103a98d76079ce1f5495e343
>
> TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/48e3a45ade15c52c0c1a10cb00907dd444897745
TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1344373005
Diffstat (limited to 'src/gpu/batches/GrAADistanceFieldPathRenderer.cpp')
| -rw-r--r-- | src/gpu/batches/GrAADistanceFieldPathRenderer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp b/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp index f06553c2d8..ee5fdb8a80 100644 --- a/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp +++ b/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp @@ -111,6 +111,8 @@ 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; @@ -276,8 +278,8 @@ private: AADistanceFieldPathBatch(const Geometry& geometry, GrColor color, const SkMatrix& viewMatrix, GrBatchAtlas* atlas, - PathCache* pathCache, PathDataList* pathList) { - this->initClassID<AADistanceFieldPathBatch>(); + PathCache* pathCache, PathDataList* pathList) + : INHERITED(ClassID()) { fBatch.fColor = color; fBatch.fViewMatrix = viewMatrix; fGeoData.push_back(geometry); @@ -519,6 +521,8 @@ private: GrBatchAtlas* fAtlas; PathCache* fPathCache; PathDataList* fPathList; + + typedef GrVertexBatch INHERITED; }; bool GrAADistanceFieldPathRenderer::onDrawPath(const DrawPathArgs& args) { |