commit aff329b8e9b239bca1d93b13a914fbef45ccf7fe
author Brian Salomon <bsalomon@google.com> Fri Aug 11 09:40:37 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Aug 11 14:13:26 2017 +0000
tree 06ba42a557c6695f145bcf4956c981fc87af55ff
parent e2cbd0451832ec71d1b498e0f64d02b7d096b2b7

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>

tests/ImageStorageTest.cpp

diff --git a/tests/ImageStorageTest.cpp b/tests/ImageStorageTest.cpp
index 589f694..6d5cab0 100644
--- a/tests/ImageStorageTest.cpp
+++ b/tests/ImageStorageTest.cpp
@@ -19,16 +19,16 @@
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageStorageLoad, reporter, ctxInfo) {
     class TestFP : public GrFragmentProcessor {
     public:
-        static sk_sp<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy,
-                                               GrSLMemoryModel mm,
-                                               GrSLRestrict restrict) {
-            return sk_sp<GrFragmentProcessor>(new TestFP(std::move(proxy), mm, restrict));
+        static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy,
+                                                         GrSLMemoryModel mm,
+                                                         GrSLRestrict restrict) {
+            return std::unique_ptr<GrFragmentProcessor>(new TestFP(std::move(proxy), mm, restrict));
         }
 
         const char* name() const override { return "Image Load Test FP"; }
 
-        sk_sp<GrFragmentProcessor> clone() const override {
-            return sk_sp<GrFragmentProcessor>(new TestFP(*this));
+        std::unique_ptr<GrFragmentProcessor> clone() const override {
+            return std::unique_ptr<GrFragmentProcessor>(new TestFP(*this));
         }
 
     private:
@@ -146,12 +146,14 @@
                     context->makeDeferredRenderTargetContext(SkBackingFit::kExact, kS, kS,
                                                              kRGBA_8888_GrPixelConfig, nullptr);
                 // We make a clone to test that copying GrFragmentProcessor::ImageStorageAccess
-                // copying works.
-                auto testFP = TestFP::Make(imageStorageTexture, mm, restrict);
-                for (auto fp : {testFP, testFP->clone()}) {
+                // works.
+                std::unique_ptr<GrFragmentProcessor> fps[2];
+                fps[0] = TestFP::Make(imageStorageTexture, mm, restrict);
+                fps[1] = fps[0]->clone();
+                for (auto& fp : fps) {
                     GrPaint paint;
                     paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
-                    paint.addColorFragmentProcessor(fp);
+                    paint.addColorFragmentProcessor(std::move(fp));
                     rtContext->drawPaint(GrNoClip(), std::move(paint), SkMatrix::I());
                     std::unique_ptr<uint32_t[]> readData(new uint32_t[kS * kS]);
                     SkImageInfo info = SkImageInfo::Make(kS, kS, kRGBA_8888_SkColorType,