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 /gm | |
| 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 'gm')
| -rw-r--r-- | gm/beziereffects.cpp | 8 | ||||
| -rw-r--r-- | gm/convexpolyeffect.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index 1886a4a2b0..81d5c583d8 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -32,6 +32,7 @@ namespace skiagm { class BezierCubicOrConicTestBatch : public GrTestBatch { public: + DEFINE_BATCH_CLASS_ID struct Geometry : public GrTestBatch::Geometry { SkRect fBounds; }; @@ -46,8 +47,7 @@ public: private: BezierCubicOrConicTestBatch(const GrGeometryProcessor* gp, const Geometry& geo, const SkScalar klmEqs[9], SkScalar sign) - : INHERITED(gp, geo.fBounds) { - this->initClassID<BezierCubicOrConicTestBatch>(); + : INHERITED(ClassID(), gp, geo.fBounds) { for (int i = 0; i < 9; i++) { fKlmEqs[i] = klmEqs[i]; } @@ -432,6 +432,7 @@ private: class BezierQuadTestBatch : public GrTestBatch { public: + DEFINE_BATCH_CLASS_ID struct Geometry : public GrTestBatch::Geometry { SkRect fBounds; }; @@ -446,10 +447,9 @@ public: private: BezierQuadTestBatch(const GrGeometryProcessor* gp, const Geometry& geo, const GrPathUtils::QuadUVMatrix& devToUV) - : INHERITED(gp, geo.fBounds) + : INHERITED(ClassID(), gp, geo.fBounds) , fGeometry(geo) , fDevToUV(devToUV) { - this->initClassID<BezierQuadTestBatch>(); } struct Vertex { diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index c014e6a7f5..35cc49859b 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -31,6 +31,7 @@ namespace skiagm { class ConvexPolyTestBatch : public GrTestBatch { public: + DEFINE_BATCH_CLASS_ID struct Geometry : public GrTestBatch::Geometry { SkRect fBounds; }; @@ -43,9 +44,8 @@ public: private: ConvexPolyTestBatch(const GrGeometryProcessor* gp, const Geometry& geo) - : INHERITED(gp, geo.fBounds) + : INHERITED(ClassID(), gp, geo.fBounds) , fGeometry(geo) { - this->initClassID<ConvexPolyTestBatch>(); } Geometry* geoData(int index) override { |