Revert of Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp

gm/localmatriximagefilter.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkBlurImageFilter.h"
@@ skipping 31 matching lines @@
 
 protected:
     SkString onShortName() override {
         return SkString("localmatriximagefilter");
     }
 
     SkISize onISize() override {
         return SkISize::Make(640, 640);
     }
 
-    static void show_image(SkCanvas* canvas, SkImage* image, sk_sp<SkImageFilter> filter) {
+    static void show_image(SkCanvas* canvas, SkImage* image, SkImageFilter* filter) {
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
         SkRect r = SkRect::MakeIWH(image->width(), image->height()).makeOutset(SK_ScalarHalf,
                                                                                SK_ScalarHalf);
         canvas->drawRect(r, paint);
 
         paint.setStyle(SkPaint::kFill_Style);
         paint.setImageFilter(filter);
         canvas->drawImage(image, 0, 0, &paint);
     }
@@ skipping 11 matching lines @@
         const SkMatrix matrices[] = {
             SkMatrix::MakeScale(SK_ScalarHalf, SK_ScalarHalf),
             SkMatrix::MakeScale(2, 2),
             SkMatrix::MakeTrans(10, 10)
         };
 
         const SkScalar spacer = image0->width() * 3.0f / 2;
 
         canvas->translate(40, 40);
         for (auto&& factory : factories) {
-            sk_sp<SkImageFilter> filter(factory());
+            SkAutoTUnref<SkImageFilter> filter(factory());
 
             canvas->save();
             show_image(canvas, image0.get(), filter);
             for (const auto& matrix : matrices) {
-                sk_sp<SkImageFilter> localFilter(filter->makeWithLocalMatrix(matrix));
+                SkAutoTUnref<SkImageFilter> localFilter(filter->newWithLocalMatrix(matrix));
                 canvas->translate(spacer, 0);
-                show_image(canvas, image0.get(), std::move(localFilter));
+                show_image(canvas, image0.get(), localFilter);
             }
             canvas->restore();
             canvas->translate(0, spacer);
         }
     }
 
 private:
     typedef GM INHERITED;
 };
 DEF_GM( return new LocalMatrixImageFilterGM; )