Update SkMatrixImageFilter to sk_sp

fuzz/FilterFuzz.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Fuzz.h"
 #include "Sk1DPathEffect.h"
 #include "Sk2DPathEffect.h"
 #include "SkAlphaThresholdFilter.h"
@@ skipping 576 matching lines @@
         break;
     case XFERMODE:
         filter = SkXfermodeImageFilter::Make(SkXfermode::Make(make_xfermode()),
                                              make_image_filter(),
                                              make_image_filter(),
                                              nullptr);
         break;
     case OFFSET:
         filter = SkOffsetImageFilter::Make(make_scalar(), make_scalar(), make_image_filter());
         break;
-    case MATRIX: {
-        sk_sp<SkImageFilter> subFilter(make_image_filter());
-        filter = sk_sp<SkImageFilter>(SkImageFilter::CreateMatrixFilter(make_matrix(),
-                                                                        (SkFilterQuality)R(4),
-                                                                        subFilter.get()));
+    case MATRIX:
+        filter = SkImageFilter::MakeMatrixFilter(make_matrix(),
+                                                 (SkFilterQuality)R(4),
+                                                 make_image_filter());
         break;
-    }
     case MATRIX_CONVOLUTION: {
         SkImageFilter::CropRect cropR(SkRect::MakeWH(SkIntToScalar(kBitmapSize),
                                                      SkIntToScalar(kBitmapSize)));
         SkISize size = SkISize::Make(R(10)+1, R(10)+1);
         int arraySize = size.width() * size.height();
         SkTArray<SkScalar> kernel(arraySize);
         for (int i = 0; i < arraySize; ++i) {
             kernel.push_back() = make_scalar();
         }
         SkIPoint kernelOffset = SkIPoint::Make(R(SkIntToScalar(size.width())),
@@ skipping 188 matching lines @@
 DEF_FUZZ(SerializedImageFilter, f) {
     fuzz = f;
     SkImageFilter* filter = make_serialized_image_filter();
 
     SkPaint paint;
     SkSafeUnref(paint.setImageFilter(filter));
     SkBitmap bitmap;
     SkCanvas canvas(bitmap);
     drawClippedBitmap(&canvas, 0, 0, paint);
 }