commit d053ce9c54d4e5937a142278359e5a4cde18095e
author reed <reed@google.com> Tue Mar 22 10:17:23 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Mar 22 10:17:23 2016 -0700
tree e85d4b9d8b23f4fc3c04e6a72173d363ba5f69d5
parent d25d06bf5f109c429e59a41d11854d2a3835abe9

Reland of [2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (patchset #1 id:1 of https://codereview.chromium.org/1821103004/ )

Reason for revert:
guard has now landed in chrome

Original issue's description:
> Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (patchset #3 id:40001 of https://codereview.chromium.org/1825073002/ )
>
> Reason for revert:
> CreateModeFilter not compiling
>
> Original issue's description:
> > Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )"
> >
> > Fixed legacy withColorFilter to call new(er) make method
> >
> > This reverts commit 1eb81db650d31f50be67b12d60c4f9e7dd08432f.
> >
> > BUG=skia:
> > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002
> >
> > TBR=
> >
> > Committed: https://skia.googlesource.com/skia/+/4c9776b046dd5e9e46e2d1ce35154855c8fcb381
>
> TBR=
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/d6889293dd0942f27f9593f679722c956831f2c4

TBR=
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:

Review URL: https://codereview.chromium.org/1827433002

include/core/SkShader.h

diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index c9c760d..e2ebda5 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -359,7 +359,7 @@
      *  Create a new shader that produces the same colors as invoking this shader and then applying
      *  the colorfilter.
      */
-    sk_sp<SkShader> makeWithColorFilter(SkColorFilter*) const;
+    sk_sp<SkShader> makeWithColorFilter(sk_sp<SkColorFilter>) const;
 
     //////////////////////////////////////////////////////////////////////////
     //  Factory methods for stock shaders
@@ -393,9 +393,7 @@
     SkShader* newWithLocalMatrix(const SkMatrix& matrix) const {
         return this->makeWithLocalMatrix(matrix).release();
     }
-    SkShader* newWithColorFilter(SkColorFilter* filter) const {
-        return this->makeWithColorFilter(filter).release();
-    }
+    SkShader* newWithColorFilter(SkColorFilter* filter) const;
 #endif
 
     /**