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

src/core/SkColorFilterShader.cpp

Index: src/core/SkColorFilterShader.cpp
diff --git a/src/core/SkColorFilterShader.cpp b/src/core/SkColorFilterShader.cpp
index 8a175024def79963a4da350025f7209c7141a66f..2e426a17eded3255f99f12f562cda2b86f510691 100644
--- a/src/core/SkColorFilterShader.cpp
+++ b/src/core/SkColorFilterShader.cpp
@@ -15,26 +15,26 @@
 #include "GrFragmentProcessor.h"
 #endif
 
-SkColorFilterShader::SkColorFilterShader(sk_sp<SkShader> shader, sk_sp<SkColorFilter> filter)
-    : fShader(std::move(shader))
-    , fFilter(std::move(filter))
+SkColorFilterShader::SkColorFilterShader(SkShader* shader, SkColorFilter* filter)
+    : fShader(SkRef(shader))
+    , fFilter(SkRef(filter))
 {
-    SkASSERT(fShader);
-    SkASSERT(fFilter);
+    SkASSERT(shader);
+    SkASSERT(filter);
 }
 
 SkFlattenable* SkColorFilterShader::CreateProc(SkReadBuffer& buffer) {
     auto shader = buffer.readShader();
-    auto filter = buffer.readColorFilter();
-    if (!shader || !filter) {
+    SkAutoTUnref<SkColorFilter> filter(buffer.readColorFilter());
+    if (!shader || !filter.get()) {
         return nullptr;
     }
-    return new SkColorFilterShader(shader, filter);
+    return new SkColorFilterShader(shader.get(), filter);
 }
 
 void SkColorFilterShader::flatten(SkWriteBuffer& buffer) const {
-    buffer.writeFlattenable(fShader.get());
-    buffer.writeFlattenable(fFilter.get());
+    buffer.writeFlattenable(fShader);
+    buffer.writeFlattenable(fFilter);
 }
 
 uint32_t SkColorFilterShader::FilterShaderContext::getFlags() const {
@@ -137,10 +137,10 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-sk_sp<SkShader> SkShader::makeWithColorFilter(sk_sp<SkColorFilter> filter) const {
+sk_sp<SkShader> SkShader::makeWithColorFilter(SkColorFilter* filter) const {
     SkShader* base = const_cast<SkShader*>(this);
     if (!filter) {
         return sk_ref_sp(base);
     }
-    return sk_make_sp<SkColorFilterShader>(sk_ref_sp(base), filter);
+    return sk_make_sp<SkColorFilterShader>(base, filter);
 }