| Index: src/gpu/effects/GrDistanceFieldTextureEffect.cpp
 | 
| diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
 | 
| index dfc4ca148354d9a92b19f42a6204d4a508817bfd..41bd42fab8d2cb9a2a0f1653116d1097dca0c730 100755
 | 
| --- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
 | 
| +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
 | 
| @@ -258,7 +258,7 @@
 | 
|      return SkNEW_ARGS(GrGLDistanceFieldTextureEffect, (*this, bt));
 | 
|  }
 | 
|  
 | 
| -void GrDistanceFieldTextureEffect::initBatchTracker(GrBatchTracker* bt, const GrPipelineInfo& init) const {
 | 
| +void GrDistanceFieldTextureEffect::initBatchTracker(GrBatchTracker* bt, const InitBT& init) const {
 | 
|      DistanceFieldBatchTracker* local = bt->cast<DistanceFieldBatchTracker>();
 | 
|      local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init,
 | 
|                                                 SkToBool(fInColor));
 | 
| @@ -520,7 +520,7 @@
 | 
|  }
 | 
|  
 | 
|  void GrDistanceFieldNoGammaTextureEffect::initBatchTracker(GrBatchTracker* bt,
 | 
| -                                                           const GrPipelineInfo& init) const {
 | 
| +                                                           const InitBT& init) const {
 | 
|      DistanceFieldNoGammaBatchTracker* local = bt->cast<DistanceFieldNoGammaBatchTracker>();
 | 
|      local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init,
 | 
|                                                 SkToBool(fInColor));
 | 
| @@ -841,7 +841,7 @@
 | 
|  }
 | 
|  
 | 
|  void GrDistanceFieldLCDTextureEffect::initBatchTracker(GrBatchTracker* bt,
 | 
| -                                                       const GrPipelineInfo& init) const {
 | 
| +                                                       const InitBT& init) const {
 | 
|      DistanceFieldLCDBatchTracker* local = bt->cast<DistanceFieldLCDBatchTracker>();
 | 
|      local->fInputColorType = GetColorInputType(&local->fColor, this->color(), init, false);
 | 
|      local->fUsesLocalCoords = init.fUsesLocalCoords;
 | 
| 
 |