| Index: gm/gradientDirtyLaundry.cpp
 | 
| diff --git a/gm/gradientDirtyLaundry.cpp b/gm/gradientDirtyLaundry.cpp
 | 
| index f7797e718fb9739b9a9d58b8cb3cca0c8b116104..baa7471ef22f56857efb78f48b8ca9ac41cccc4d 100644
 | 
| --- a/gm/gradientDirtyLaundry.cpp
 | 
| +++ b/gm/gradientDirtyLaundry.cpp
 | 
| @@ -35,33 +35,28 @@ static const GradData gGradData[] = {
 | 
|      //  { 2, gCol2, NULL },
 | 
|  };
 | 
|  
 | 
| -static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data,
 | 
| -                            SkShader::TileMode tm, SkUnitMapper* mapper) {
 | 
| -    return SkGradientShader::CreateLinear(pts, data.fColors, data.fPos,
 | 
| -                                          data.fCount, tm, mapper);
 | 
| +static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) {
 | 
| +    return SkGradientShader::CreateLinear(pts, data.fColors, data.fPos, data.fCount, tm);
 | 
|  }
 | 
|  
 | 
| -static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data,
 | 
| -                            SkShader::TileMode tm, SkUnitMapper* mapper) {
 | 
| +static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) {
 | 
|      SkPoint center;
 | 
|      center.set(SkScalarAve(pts[0].fX, pts[1].fX),
 | 
|                 SkScalarAve(pts[0].fY, pts[1].fY));
 | 
|      return SkGradientShader::CreateRadial(center, center.fX, data.fColors,
 | 
| -                                          data.fPos, data.fCount, tm, mapper);
 | 
| +                                          data.fPos, data.fCount, tm);
 | 
|  }
 | 
|  
 | 
| -static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data,
 | 
| -                           SkShader::TileMode, SkUnitMapper* mapper) {
 | 
| +static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, SkShader::TileMode) {
 | 
|      SkPoint center;
 | 
|      center.set(SkScalarAve(pts[0].fX, pts[1].fX),
 | 
|                 SkScalarAve(pts[0].fY, pts[1].fY));
 | 
| -    return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors,
 | 
| -                                         data.fPos, data.fCount, mapper);
 | 
| +    return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors, data.fPos, data.fCount);
 | 
|  }
 | 
|  
 | 
|  
 | 
| -typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data,
 | 
| -                               SkShader::TileMode tm, SkUnitMapper* mapper);
 | 
| +typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm);
 | 
| +
 | 
|  static const GradMaker gGradMakers[] = {
 | 
|      MakeLinear, MakeRadial, MakeSweep,
 | 
|  };
 | 
| @@ -95,7 +90,7 @@ protected:
 | 
|          for (size_t i = 0; i < SK_ARRAY_COUNT(gGradData); i++) {
 | 
|              canvas->save();
 | 
|              for (size_t j = 0; j < SK_ARRAY_COUNT(gGradMakers); j++) {
 | 
| -                SkShader* shader = gGradMakers[j](pts, gGradData[i], tm, NULL);
 | 
| +                SkShader* shader = gGradMakers[j](pts, gGradData[i], tm);
 | 
|                  paint.setShader(shader)->unref();
 | 
|                  canvas->drawRect(r, paint);
 | 
|                  canvas->translate(0, SkIntToScalar(120));
 | 
| 
 |