Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: gm/beziereffects.cpp

Issue 1345393003: Revert of add a ClassID function to GrBatch (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gm/convexpolyeffect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/beziereffects.cpp
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 81d5c583d8c89778e4c5db6b0d1f5a1a27b151ed..1886a4a2b0ae811503045fc42a389dadd4736838 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -32,7 +32,6 @@
class BezierCubicOrConicTestBatch : public GrTestBatch {
public:
- DEFINE_BATCH_CLASS_ID
struct Geometry : public GrTestBatch::Geometry {
SkRect fBounds;
};
@@ -47,7 +46,8 @@
private:
BezierCubicOrConicTestBatch(const GrGeometryProcessor* gp, const Geometry& geo,
const SkScalar klmEqs[9], SkScalar sign)
- : INHERITED(ClassID(), gp, geo.fBounds) {
+ : INHERITED(gp, geo.fBounds) {
+ this->initClassID<BezierCubicOrConicTestBatch>();
for (int i = 0; i < 9; i++) {
fKlmEqs[i] = klmEqs[i];
}
@@ -432,7 +432,6 @@
class BezierQuadTestBatch : public GrTestBatch {
public:
- DEFINE_BATCH_CLASS_ID
struct Geometry : public GrTestBatch::Geometry {
SkRect fBounds;
};
@@ -447,9 +446,10 @@
private:
BezierQuadTestBatch(const GrGeometryProcessor* gp, const Geometry& geo,
const GrPathUtils::QuadUVMatrix& devToUV)
- : INHERITED(ClassID(), gp, geo.fBounds)
+ : INHERITED(gp, geo.fBounds)
, fGeometry(geo)
, fDevToUV(devToUV) {
+ this->initClassID<BezierQuadTestBatch>();
}
struct Vertex {
« no previous file with comments | « no previous file | gm/convexpolyeffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698