Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o…

gm/imagefilters.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 "SkBlurImageFilter.h"
 #include "SkColorMatrixFilter.h"
@@ skipping 122 matching lines @@
         } else {
             dx = 0;
             dy = offset;
         }
     }
 }
 
 DEF_SIMPLE_GM(savelayer_with_backdrop, canvas, 830, 550) {
     SkColorMatrix cm;
     cm.setSaturation(10);
-    auto cf(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
+    SkAutoTUnref<SkColorFilter> cf(SkColorMatrixFilter::Create(cm));
     const SkScalar kernel[] = { 4, 0, 4, 0, -15, 0, 4, 0, 4 };
     SkImageFilter* filters[] = {
         SkBlurImageFilter::Create(10, 10),
         SkDilateImageFilter::Create(8, 8),
         SkMatrixConvolutionImageFilter::Create({ 3, 3 }, kernel, 1, 0, { 0, 0 },
                                            SkMatrixConvolutionImageFilter::kClampToBlack_TileMode,
                                                true),
-        SkColorFilterImageFilter::Create(cf.get()),
+        SkColorFilterImageFilter::Create(cf),
     };
 
     const struct {
         SkScalar    fSx, fSy, fTx, fTy;
     } xforms[] = {
         { 1, 1, 0, 0 },
         { 0.5f, 0.5f, 530, 0 },
         { 0.25f, 0.25f, 530, 275 },
         { 0.125f, 0.125f, 530, 420 },
     };
 
     SkPaint paint;
     paint.setFilterQuality(kMedium_SkFilterQuality);
     sk_sp<SkImage> image(GetResourceAsImage("mandrill_512.png"));
 
     canvas->translate(20, 20);
     for (const auto& xform : xforms) {
         canvas->save();
         canvas->translate(xform.fTx, xform.fTy);
         canvas->scale(xform.fSx, xform.fSy);
         canvas->drawImage(image, 0, 0, &paint);
         draw_set(canvas, filters, SK_ARRAY_COUNT(filters));
         canvas->restore();
     }
 
     for (auto& filter : filters) {
         filter->unref();
     }
 }