| Index: gm/beziereffects.cpp
|
| diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
|
| index 1886a4a2b0ae811503045fc42a389dadd4736838..81d5c583d8c89778e4c5db6b0d1f5a1a27b151ed 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 {
|
|
|