sk_sp versions of newWithColorFilter and newWithLocalMatrix

tests/SkColor4fTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColor.h"
 #include "SkColorMatrixFilter.h"
 #include "SkGradientShader.h"
@@ skipping 107 matching lines @@
     const SkColor colors[] { SK_ColorRED, SK_ColorBLUE };
     return SkGradientShader::CreateLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode);
 #else
     // TODO: need to convert new gradient code to enforce PM4f --> RGBA order
     return make_color_sh();
 #endif
 }
 
 static sk_sp<SkShader> make_cf_sh() {
     SkAutoTUnref<SkColorFilter> filter(make_mx_cf());
-    sk_sp<SkShader> shader(make_color_sh());
-    return sk_sp<SkShader>(shader->newWithColorFilter(filter));
+    return make_color_sh()->makeWithColorFilter(filter);
 }
 
 static bool compare_spans(const SkPM4f span4f[], const SkPMColor span4b[], int count,
                           float tolerance = 1.0f/255) {
     for (int i = 0; i < count; ++i) {
         SkPM4f c0 = SkPM4f::FromPMColor(span4b[i]);
         SkPM4f c1 = span4f[i];
         if (!nearly_equal(c0, c1, tolerance)) {
             return false;
         }
@@ skipping 104 matching lines @@
 //
 DEF_TEST(Color4f_xfermode_proc4f, reporter) {
     // TODO: extend xfermodes so that all cases can be tested.
     //
     for (int mode = SkXfermode::kClear_Mode; mode <= SkXfermode::kScreen_Mode; ++mode) {
         SkXfermodeProc   proc32 = SkXfermode::GetProc((SkXfermode::Mode)mode);
         SkXfermodeProc4f proc4f = SkXfermode::GetProc4f((SkXfermode::Mode)mode);
         REPORTER_ASSERT(reporter, compare_procs(proc32, proc4f));
     }
 }