Update SkImageSource to sk_sp

gm/bigtileimagefilter.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImageSource.h"
 #include "SkSurface.h"
 #include "SkTileImageFilter.h"
@@ skipping 36 matching lines @@
         fRedImage = create_circle_texture(kBitmapSize, SK_ColorRED);
         fGreenImage = create_circle_texture(kBitmapSize, SK_ColorGREEN);
     }
 
     void onDraw(SkCanvas* canvas) override {
         canvas->clear(SK_ColorBLACK);
 
         {
             SkPaint p;
 
-            SkRect bound = SkRect::MakeWH(SkIntToScalar(kWidth), SkIntToScalar(kHeight));
-            sk_sp<SkImageFilter> imageSource(SkImageSource::Create(fRedImage.get()));
-            SkAutoTUnref<SkImageFilter> tif(SkTileImageFilter::Create(
-                            SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)),
-                            SkRect::MakeWH(SkIntToScalar(kWidth), SkIntToScalar(kHeight)),
-                            imageSource.get()));
-            p.setImageFilter(tif);
+            const SkRect bound = SkRect::MakeIWH(kWidth, kHeight);
+            sk_sp<SkImageFilter> imageSource(SkImageSource::Make(fRedImage));
+
+            p.setImageFilter(SkTileImageFilter::Create(SkRect::MakeIWH(kBitmapSize, kBitmapSize),

[f(malita), 2016/03/31 13:26:09]

out-of-order ditto

[robertphillips, 2016/03/31 14:35:53]

Done.

+                                                       SkRect::MakeIWH(kWidth, kHeight),
+                                                       imageSource.get()));
 
             canvas->saveLayer(&bound, &p);
             canvas->restore();
         }
 
         {
             SkPaint p2;
 
-            SkRect bound2 = SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize));
+            const SkRect bound2 = SkRect::MakeIWH(kBitmapSize, kBitmapSize);
 
-            SkAutoTUnref<SkImageFilter> tif2(SkTileImageFilter::Create(
-                            SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)),
-                            SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)),
-                            nullptr));
-            p2.setImageFilter(tif2);
+            p2.setImageFilter(SkTileImageFilter::Create(SkRect::MakeIWH(kBitmapSize, kBitmapSize),

[f(malita), 2016/03/31 13:26:09]

out-of-order ditto

[robertphillips, 2016/03/31 14:35:54]

Done.

+                                                        SkRect::MakeIWH(kBitmapSize, kBitmapSize),
+                                                        nullptr));
 
             canvas->translate(320, 320);
             canvas->saveLayer(&bound2, &p2);
             canvas->setMatrix(SkMatrix::I());
 
             SkRect bound3 = SkRect::MakeXYWH(320, 320,
                                              SkIntToScalar(kBitmapSize),
                                              SkIntToScalar(kBitmapSize));
             canvas->drawImageRect(fGreenImage.get(), bound2, bound3, nullptr,
                                   SkCanvas::kStrict_SrcRectConstraint);
             canvas->restore();
         }
     }
 
 private:
     static const int kWidth = 512;
     static const int kHeight = 512;
     static const int kBitmapSize = 64;
 
     sk_sp<SkImage> fRedImage;
     sk_sp<SkImage> fGreenImage;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new BigTileImageFilterGM;)
 }