diff options
author | 2017-08-11 09:40:37 -0400 | |
---|---|---|
committer | 2017-08-11 14:13:26 +0000 | |
commit | aff329b8e9b239bca1d93b13a914fbef45ccf7fe (patch) | |
tree | 06ba42a557c6695f145bcf4956c981fc87af55ff /src/shaders/SkColorFilterShader.cpp | |
parent | e2cbd0451832ec71d1b498e0f64d02b7d096b2b7 (diff) |
Make GrFragmentProcessor be non-refcounted and use std::unique_ptr.
Change-Id: I985e54a071338e99292a5aa2f42c92bc115b4008
Reviewed-on: https://skia-review.googlesource.com/32760
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/shaders/SkColorFilterShader.cpp')
-rw-r--r-- | src/shaders/SkColorFilterShader.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/shaders/SkColorFilterShader.cpp b/src/shaders/SkColorFilterShader.cpp index a2d5433bad..bacfc37814 100644 --- a/src/shaders/SkColorFilterShader.cpp +++ b/src/shaders/SkColorFilterShader.cpp @@ -56,20 +56,19 @@ sk_sp<SkShader> SkColorFilterShader::onMakeColorSpace(SkColorSpaceXformer* xform #if SK_SUPPORT_GPU ///////////////////////////////////////////////////////////////////// -sk_sp<GrFragmentProcessor> SkColorFilterShader::asFragmentProcessor(const AsFPArgs& args) const { - - sk_sp<GrFragmentProcessor> fp1(as_SB(fShader)->asFragmentProcessor(args)); +std::unique_ptr<GrFragmentProcessor> SkColorFilterShader::asFragmentProcessor( + const AsFPArgs& args) const { + auto fp1 = as_SB(fShader)->asFragmentProcessor(args); if (!fp1) { return nullptr; } - sk_sp<GrFragmentProcessor> fp2(fFilter->asFragmentProcessor(args.fContext, - args.fDstColorSpace)); + auto fp2 = fFilter->asFragmentProcessor(args.fContext, args.fDstColorSpace); if (!fp2) { return fp1; } - sk_sp<GrFragmentProcessor> fpSeries[] = { std::move(fp1), std::move(fp2) }; + std::unique_ptr<GrFragmentProcessor> fpSeries[] = { std::move(fp1), std::move(fp2) }; return GrFragmentProcessor::RunInSeries(fpSeries, 2); } #endif |