| Index: samplecode/SampleSlides.cpp
 | 
| diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
 | 
| index d828ae601f4470e5978231d30b6a2e68719e8496..6bc9a28fd3716615dac573f1c0ee461068de3325 100644
 | 
| --- a/samplecode/SampleSlides.cpp
 | 
| +++ b/samplecode/SampleSlides.cpp
 | 
| @@ -178,32 +178,26 @@ static const GradData gGradData[] = {
 | 
|  { 5, gColors, gPos2 }
 | 
|  };
 | 
|  
 | 
| -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 tm, SkUnitMapper* mapper) {
 | 
| +static SkShader* MakeSweep(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::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);
 | 
|  }
 | 
|  
 | 
| -static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data,
 | 
| -                             SkShader::TileMode tm, SkUnitMapper* mapper) {
 | 
| +static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) {
 | 
|      SkPoint center0, center1;
 | 
|      center0.set(SkScalarAve(pts[0].fX, pts[1].fX),
 | 
|                  SkScalarAve(pts[0].fY, pts[1].fY));
 | 
| @@ -212,11 +206,10 @@ static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data,
 | 
|      return SkGradientShader::CreateTwoPointRadial(
 | 
|                                                    center1, (pts[1].fX - pts[0].fX) / 7,
 | 
|                                                    center0, (pts[1].fX - pts[0].fX) / 2,
 | 
| -                                                  data.fColors, data.fPos, data.fCount, tm, mapper);
 | 
| +                                                  data.fColors, data.fPos, data.fCount, tm);
 | 
|  }
 | 
|  
 | 
| -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, Make2Radial
 | 
|  };
 | 
| @@ -236,7 +229,7 @@ static void gradient_slide(SkCanvas* canvas) {
 | 
|      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);
 | 
|              canvas->drawRect(r, paint);
 | 
|              shader->unref();
 | 
| @@ -335,7 +328,7 @@ static SkShader* make_shader1(const SkIPoint& size) {
 | 
|                        { SkIntToScalar(size.fX), SkIntToScalar(size.fY) } };
 | 
|      SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorRED };
 | 
|      return SkGradientShader::CreateLinear(pts, colors, NULL,
 | 
| -                                          SK_ARRAY_COUNT(colors), SkShader::kMirror_TileMode, NULL);
 | 
| +                                          SK_ARRAY_COUNT(colors), SkShader::kMirror_TileMode);
 | 
|  }
 | 
|  
 | 
|  class Rec {
 | 
| 
 |