aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrPaint.h
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-08-11 09:40:37 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-11 14:13:26 +0000
commitaff329b8e9b239bca1d93b13a914fbef45ccf7fe (patch)
tree06ba42a557c6695f145bcf4956c981fc87af55ff /src/gpu/GrPaint.h
parente2cbd0451832ec71d1b498e0f64d02b7d096b2b7 (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/gpu/GrPaint.h')
-rw-r--r--src/gpu/GrPaint.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrPaint.h b/src/gpu/GrPaint.h
index 1ab01f3ce4..ae19cad176 100644
--- a/src/gpu/GrPaint.h
+++ b/src/gpu/GrPaint.h
@@ -91,7 +91,7 @@ public:
/**
* Appends an additional color processor to the color computation.
*/
- void addColorFragmentProcessor(sk_sp<GrFragmentProcessor> fp) {
+ void addColorFragmentProcessor(std::unique_ptr<GrFragmentProcessor> fp) {
SkASSERT(fp);
fColorFragmentProcessors.push_back(std::move(fp));
fTrivial = false;
@@ -100,7 +100,7 @@ public:
/**
* Appends an additional coverage processor to the coverage computation.
*/
- void addCoverageFragmentProcessor(sk_sp<GrFragmentProcessor> fp) {
+ void addCoverageFragmentProcessor(std::unique_ptr<GrFragmentProcessor> fp) {
SkASSERT(fp);
fCoverageFragmentProcessors.push_back(std::move(fp));
fTrivial = false;
@@ -157,8 +157,8 @@ private:
friend class GrProcessorSet;
const GrXPFactory* fXPFactory = nullptr;
- SkSTArray<4, sk_sp<GrFragmentProcessor>> fColorFragmentProcessors;
- SkSTArray<2, sk_sp<GrFragmentProcessor>> fCoverageFragmentProcessors;
+ SkSTArray<4, std::unique_ptr<GrFragmentProcessor>> fColorFragmentProcessors;
+ SkSTArray<2, std::unique_ptr<GrFragmentProcessor>> fCoverageFragmentProcessors;
bool fDisableOutputConversionToSRGB = false;
bool fAllowSRGBInputs = false;
bool fTrivial = true;