Index: src/gpu/effects/GrDashingEffect.cpp |
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp |
index 3ca4c7ae4b6379a1042767c39b6498e1a7bc9ad2..106ee49672481aca90307ac772b9bfb1ad64c0a4 100644 |
--- a/src/gpu/effects/GrDashingEffect.cpp |
+++ b/src/gpu/effects/GrDashingEffect.cpp |
@@ -245,8 +245,9 @@ static GrGeometryProcessor* create_dash_gp(GrColor, |
class DashBatch : public GrVertexBatch { |
public: |
+ DEFINE_BATCH_CLASS_ID |
+ |
struct Geometry { |
- GrColor fColor; |
SkMatrix fViewMatrix; |
SkMatrix fSrcRotInv; |
SkPoint fPtsRot[2]; |
@@ -255,6 +256,7 @@ public: |
SkScalar fIntervals[2]; |
SkScalar fParallelScale; |
SkScalar fPerpendicularScale; |
+ GrColor fColor; |
}; |
static GrDrawBatch* Create(const Geometry& geometry, SkPaint::Cap cap, DashAAMode aaMode, |
@@ -275,8 +277,8 @@ public: |
SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; } |
private: |
- DashBatch(const Geometry& geometry, SkPaint::Cap cap, DashAAMode aaMode, bool fullDash) { |
- this->initClassID<DashBatch>(); |
+ DashBatch(const Geometry& geometry, SkPaint::Cap cap, DashAAMode aaMode, bool fullDash) |
+ : INHERITED(ClassID()) { |
fGeoData.push_back(geometry); |
fBatch.fAAMode = aaMode; |
@@ -674,6 +676,8 @@ private: |
BatchTracker fBatch; |
SkSTArray<1, Geometry, true> fGeoData; |
+ |
+ typedef GrVertexBatch INHERITED; |
}; |
static GrDrawBatch* create_batch(GrColor color, const SkMatrix& viewMatrix, const SkPoint pts[2], |