commit c91fd3447e1d3452d5e43e70e371896c80645b61
author robertphillips <robertphillips@google.com> Mon Apr 25 12:32:54 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Apr 25 12:32:55 2016 -0700
tree ec9a701b992bf549c2c220042fa44ce5c8cd8633
parent 1eca11659e217eca138c230525a52deb3d52b2d3

Add another dollop of sk_sp to SkSpecialImage and SkSpecialSurface

This is split out of https://codereview.chromium.org/1914883002/ (Refactor drawContext/RenderTarget creation)

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1913743002

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

tests/ImageFilterCacheTest.cpp

diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp
index 40c805a..58d279c 100644
--- a/tests/ImageFilterCacheTest.cpp
+++ b/tests/ImageFilterCacheTest.cpp
@@ -213,7 +213,7 @@
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterCache_GPUBacked, reporter, ctxInfo) {
 
-    SkAutoTUnref<GrTexture> srcTexture(create_texture(ctxInfo.fGrContext));
+    sk_sp<GrTexture> srcTexture(create_texture(ctxInfo.fGrContext));
     if (!srcTexture) {
         return;
     }

tests/ImageFilterTest.cpp

diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 952e5e5..54e9a60 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -368,6 +368,7 @@
 }
 
 static sk_sp<SkSpecialSurface> create_empty_special_surface(GrContext* context, int widthHeight) {
+#if SK_SUPPORT_GPU
     if (context) {
         GrSurfaceDesc desc;
         desc.fConfig = kSkia8888_GrPixelConfig;
@@ -375,7 +376,9 @@
         desc.fWidth  = widthHeight;
         desc.fHeight = widthHeight;
         return SkSpecialSurface::MakeRenderTarget(context, desc);
-    } else {
+    } else
+#endif
+    {
         const SkImageInfo info = SkImageInfo::MakeN32(widthHeight, widthHeight,
                                                       kOpaque_SkAlphaType);
         return SkSpecialSurface::MakeRaster(info);

tests/SpecialImageTest.cpp

diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index 18d023f..f517447 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -243,10 +243,10 @@
         desc.fWidth = kFullSize;
         desc.fHeight = kFullSize;
 
-        SkAutoTUnref<GrTexture> texture(context->textureProvider()->createTexture(desc,
-                                                                                  SkBudgeted::kNo,
-                                                                                  bm.getPixels(),
-                                                                                  0));
+        sk_sp<GrTexture> texture(context->textureProvider()->createTexture(desc,
+                                                                           SkBudgeted::kNo,
+                                                                           bm.getPixels(),
+                                                                           0));
         if (!texture) {
             return;
         }
@@ -255,7 +255,7 @@
                                                                 SkIRect::MakeWH(kFullSize,
                                                                                 kFullSize),
                                                                 kNeedNewImageUniqueID_SpecialImage,
-                                                                texture));
+                                                                std::move(texture)));
 
         {
             sk_sp<SkSpecialImage> fromGPU(gpuImage->makeTextureImage(context));
@@ -281,9 +281,9 @@
     desc.fWidth  = kFullSize;
     desc.fHeight = kFullSize;
 
-    SkAutoTUnref<GrTexture> texture(context->textureProvider()->createTexture(desc,
-                                                                              SkBudgeted::kNo,
-                                                                              bm.getPixels(), 0));
+    sk_sp<GrTexture> texture(context->textureProvider()->createTexture(desc,
+                                                                       SkBudgeted::kNo,
+                                                                       bm.getPixels(), 0));
     if (!texture) {
         return;
     }

tests/SpecialSurfaceTest.cpp

diff --git a/tests/SpecialSurfaceTest.cpp b/tests/SpecialSurfaceTest.cpp
index 7169b5e..8c560fe 100644
--- a/tests/SpecialSurfaceTest.cpp
+++ b/tests/SpecialSurfaceTest.cpp
@@ -98,12 +98,12 @@
     desc.fWidth = kFullSize;
     desc.fHeight = kFullSize;
 
-    SkAutoTUnref<GrTexture> temp(ctxInfo.fGrContext->textureProvider()->createApproxTexture(desc));
+    sk_sp<GrTexture> temp(ctxInfo.fGrContext->textureProvider()->createApproxTexture(desc));
     SkASSERT_RELEASE(temp);
 
     const SkIRect subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize);
 
-    sk_sp<SkSpecialSurface> surf(SkSpecialSurface::MakeFromTexture(subset, temp));
+    sk_sp<SkSpecialSurface> surf(SkSpecialSurface::MakeFromTexture(subset, std::move(temp)));
 
     test_surface(surf, reporter, kPad);