diff options
author | reed <reed@google.com> | 2016-03-22 07:35:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 07:35:17 -0700 |
commit | 1eb81db650d31f50be67b12d60c4f9e7dd08432f (patch) | |
tree | 58a5fd565f06a398192be170009fefa2a12a1ee2 /gm/modecolorfilters.cpp | |
parent | ee451cf09de31267c93b64e1fdac7c823cee7e85 (diff) |
Revert of switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )
Reason for revert:
need to fix unguarded makeWithFilter
Original issue's description:
> switch colorfilters to sk_sp
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002
>
> Committed: https://skia.googlesource.com/skia/+/f809d7687a4fb7b88b651b046da2bc0035d6aa09
TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1820303002
Diffstat (limited to 'gm/modecolorfilters.cpp')
-rw-r--r-- | gm/modecolorfilters.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp index 4e5d45cf96..de6a18a41c 100644 --- a/gm/modecolorfilters.cpp +++ b/gm/modecolorfilters.cpp @@ -121,7 +121,9 @@ protected: static const int kRectsPerRow = SkMax32(this->getISize().fWidth / kRectWidth, 1); for (size_t cfm = 0; cfm < SK_ARRAY_COUNT(modes); ++cfm) { for (size_t cfc = 0; cfc < SK_ARRAY_COUNT(colors); ++cfc) { - paint.setColorFilter(SkColorFilter::MakeModeFilter(colors[cfc], modes[cfm])); + SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(colors[cfc], + modes[cfm])); + paint.setColorFilter(cf); for (size_t s = 0; s < SK_ARRAY_COUNT(shaders); ++s) { paint.setShader(shaders[s]); bool hasShader = nullptr == paint.getShader(); |