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

src/core/SkCanvas.cpp

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCanvasPriv.h"
@@ skipping 373 matching lines @@
 /////////////////////////////////////////////////////////////////////////////
 
 static SkPaint* set_if_needed(SkLazyPaint* lazy, const SkPaint& orig) {
     return lazy->isValid() ? lazy->get() : lazy->set(orig);
 }
 
 /**
  *  If the paint has an imagefilter, but it can be simplified to just a colorfilter, return that
  *  colorfilter, else return nullptr.
  */
-static sk_sp<SkColorFilter> image_to_color_filter(const SkPaint& paint) {
+static SkColorFilter* image_to_color_filter(const SkPaint& paint) {
     SkImageFilter* imgf = paint.getImageFilter();
     if (!imgf) {
         return nullptr;
     }
 
-    SkColorFilter* imgCFPtr;
-    if (!imgf->asAColorFilter(&imgCFPtr)) {
+    SkColorFilter* imgCF;
+    if (!imgf->asAColorFilter(&imgCF)) {
         return nullptr;
     }
-    sk_sp<SkColorFilter> imgCF(imgCFPtr);
 
     SkColorFilter* paintCF = paint.getColorFilter();
     if (nullptr == paintCF) {
         // there is no existing paint colorfilter, so we can just return the imagefilter's
         return imgCF;
     }
 
     // The paint has both a colorfilter(paintCF) and an imagefilter-which-is-a-colorfilter(imgCF)
     // and we need to combine them into a single colorfilter.
-    return SkColorFilter::MakeComposeFilter(std::move(imgCF), sk_ref_sp(paintCF));
+    SkAutoTUnref<SkColorFilter> autoImgCF(imgCF);
+    return SkColorFilter::CreateComposeFilter(imgCF, paintCF);
 }
 
 /**
  * There are many bounds in skia. A circle's bounds is just its center extended by its radius.
  * However, if we stroke a circle, then the "bounds" of that is larger, since it will now draw
  * outside of its raw-bounds by 1/2 the stroke width.  SkPaint has lots of optional
  * effects/attributes that can modify the effective bounds of a given primitive -- maskfilters,
  * patheffects, stroking, etc.  This function takes a raw bounds and a paint, and returns the
  * conservative "effective" bounds based on the settings in the paint... with one exception. This
  * function does *not* look at the imagefilter, which can also modify the effective bounds. It is
@@ skipping 23 matching lines @@
 #ifdef SK_SUPPORT_LEGACY_DRAWFILTER
         fFilter = canvas->getDrawFilter();
 #else
         fFilter = nullptr;
 #endif
         fPaint = &fOrigPaint;
         fSaveCount = canvas->getSaveCount();
         fTempLayerForImageFilter = false;
         fDone = false;
 
-        auto simplifiedCF = image_to_color_filter(fOrigPaint);
+        SkColorFilter* simplifiedCF = image_to_color_filter(fOrigPaint);
         if (simplifiedCF) {
             SkPaint* paint = set_if_needed(&fLazyPaintInit, fOrigPaint);
-            paint->setColorFilter(std::move(simplifiedCF));
+            paint->setColorFilter(simplifiedCF)->unref();
             paint->setImageFilter(nullptr);
             fPaint = paint;
         }
 
         if (!skipLayerForImageFilter && fPaint->getImageFilter()) {
             /**
              *  We implement ImageFilters for a given draw by creating a layer, then applying the
              *  imagefilter to the pixels of that layer (its backing surface/image), and then
              *  we call restore() to xfer that layer to the main canvas.
              *
@@ skipping 2564 matching lines @@
     }
 
     if (matrix) {
         canvas->concat(*matrix);
     }
 }
 
 SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
     fCanvas->restoreToCount(fSaveCount);
 }