| Index: src/gpu/effects/GrDashingEffect.cpp
|
| diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
|
| index 34e03011b2aced46670e3747f87f909164a61fa9..4a034060de49e5a8f7a3840a27559cb7b0d7677b 100644
|
| --- a/src/gpu/effects/GrDashingEffect.cpp
|
| +++ b/src/gpu/effects/GrDashingEffect.cpp
|
| @@ -501,7 +501,7 @@
|
| virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker&,
|
| const GrGLCaps&) const SK_OVERRIDE;
|
|
|
| - void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const SK_OVERRIDE;
|
| + void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE;
|
|
|
| bool onCanMakeEqual(const GrBatchTracker&,
|
| const GrGeometryProcessor&,
|
| @@ -706,7 +706,7 @@
|
| fCenterX == dce.fCenterX);
|
| }
|
|
|
| -void DashingCircleEffect::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const {
|
| +void DashingCircleEffect::initBatchTracker(GrBatchTracker* bt, const InitBT& init) const {
|
| DashingCircleBatchTracker* local = bt->cast<DashingCircleBatchTracker>();
|
| local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init, false);
|
| local->fUsesLocalCoords = init.fUsesLocalCoords;
|
| @@ -795,7 +795,7 @@
|
| virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
|
| const GrGLCaps&) const SK_OVERRIDE;
|
|
|
| - void initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const SK_OVERRIDE;
|
| + void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE;
|
|
|
| bool onCanMakeEqual(const GrBatchTracker&,
|
| const GrGeometryProcessor&,
|
| @@ -1013,7 +1013,7 @@
|
| fIntervalLength == de.fIntervalLength);
|
| }
|
|
|
| -void DashingLineEffect::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const {
|
| +void DashingLineEffect::initBatchTracker(GrBatchTracker* bt, const InitBT& init) const {
|
| DashingLineBatchTracker* local = bt->cast<DashingLineBatchTracker>();
|
| local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init, false);
|
| local->fUsesLocalCoords = init.fUsesLocalCoords;
|
|
|