update callsites for Make image factories

gm/rectangletexture.cpp

 
 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 36 matching lines @@
         canvas.drawPaint(paint);
 
         SkColor colors1[] = { 0xFFA07010 , 0xFFA02080 };
         paint.setAntiAlias(true);
         paint.setShader(SkGradientShader::MakeLinear(pts, colors1, nullptr, 2,
                                                      SkShader::kClamp_TileMode));
         canvas.drawCircle(SkIntToScalar(width) / 2, SkIntToScalar(height) / 2,
                           SkIntToScalar(width + height) / 5, paint);
     }
 
-    SkImage* createRectangleTextureImg(GrContext* context, int width, int height, void* pixels) {
+    sk_sp<SkImage> createRectangleTextureImg(GrContext* context, int width, int height,
+                                             void* pixels) {
         if (!context) {
             return nullptr;
         }
         GrGpu* gpu = context->getGpu();
         if (!gpu) {
             return nullptr;
         }
         const GrGLContext* glCtx = gpu->glContextForTesting();
         if (!glCtx) {
             return nullptr;
@@ skipping 36 matching lines @@
         context->resetContext();
         GrGLTextureInfo info;
         info.fID = id;
         info.fTarget = TARGET;
         GrBackendTextureDesc desc;
         desc.fConfig = kRGBA_8888_GrPixelConfig;
         desc.fWidth = width;
         desc.fHeight = height;
         desc.fOrigin = kTopLeft_GrSurfaceOrigin;
         desc.fTextureHandle = reinterpret_cast<GrBackendObject>(&info);
-        if (SkImage* image = SkImage::NewFromAdoptedTexture(context, desc)) {
+        if (sk_sp<SkImage> image = SkImage::MakeFromAdoptedTexture(context, desc)) {
             return image;
         }
         GR_GL_CALL(gl, DeleteTextures(1, &id));
         return nullptr;
     }
 
     void onDraw(SkCanvas* canvas) override {
         GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
         GrContext* context;
         if (!rt || !(context = rt->getContext())) {
             skiagm::GM::DrawGpuOnlyMessage(canvas);
             return;
         }
 
         static const int kWidth = 50;
         static const int kHeight = 50;
         static const SkScalar kPad = 5.f;
 
         SkPMColor pixels[kWidth * kHeight];
         this->fillPixels(kWidth, kHeight, pixels);
-        SkAutoTUnref<SkImage> rectImg(this->createRectangleTextureImg(context, kWidth, kHeight,
-                                                                      pixels));
+        sk_sp<SkImage> rectImg(this->createRectangleTextureImg(context, kWidth, kHeight, pixels));
 
         if (!rectImg) {
             SkPaint paint;
             paint.setAntiAlias(true);
             static const char* kMsg = "Could not create rectangle texture image.";
             canvas->drawText(kMsg, strlen(kMsg), 10, 100, paint);
             return;
         }
 
         static const SkFilterQuality kQualities[] = {
             kNone_SkFilterQuality,
             kLow_SkFilterQuality,
             kMedium_SkFilterQuality,
             kHigh_SkFilterQuality,
         };
 
         static const SkScalar kScales[] = { 1.0f, 1.2f, 0.75f };
 
         canvas->translate(kPad, kPad);
         for (auto s : kScales) {
             canvas->save();
             canvas->scale(s, s);
             for (auto q : kQualities) {
-                    SkPaint plainPaint;
-                    plainPaint.setFilterQuality(q);
-                    canvas->drawImage(rectImg, 0, 0, &plainPaint);
-                    canvas->translate(kWidth + kPad, 0);
+                SkPaint plainPaint;
+                plainPaint.setFilterQuality(q);
+                canvas->drawImage(rectImg.get(), 0, 0, &plainPaint);
+                canvas->translate(kWidth + kPad, 0);
 
-                    SkPaint clampPaint;
-                    clampPaint.setFilterQuality(q);
-                    clampPaint.setShader(rectImg->makeShader(SkShader::kClamp_TileMode,
-                                                             SkShader::kClamp_TileMode));
-                    canvas->drawRect(SkRect::MakeWH(1.5f * kWidth, 1.5f * kHeight), clampPaint);
-                    canvas->translate(kWidth * 1.5f + kPad, 0);
+                SkPaint clampPaint;
+                clampPaint.setFilterQuality(q);
+                clampPaint.setShader(rectImg->makeShader(SkShader::kClamp_TileMode,
+                                                         SkShader::kClamp_TileMode));
+                canvas->drawRect(SkRect::MakeWH(1.5f * kWidth, 1.5f * kHeight), clampPaint);
+                canvas->translate(kWidth * 1.5f + kPad, 0);
 
-                    SkPaint repeatPaint;
-                    repeatPaint.setFilterQuality(q);
-                    repeatPaint.setShader(rectImg->makeShader(SkShader::kRepeat_TileMode,
-                                                              SkShader::kMirror_TileMode));
-                    canvas->drawRect(SkRect::MakeWH(1.5f * kWidth, 1.5f * kHeight), repeatPaint);
-                    canvas->translate(1.5f * kWidth + kPad, 0);
+                SkPaint repeatPaint;
+                repeatPaint.setFilterQuality(q);
+                repeatPaint.setShader(rectImg->makeShader(SkShader::kRepeat_TileMode,
+                                                          SkShader::kMirror_TileMode));
+                canvas->drawRect(SkRect::MakeWH(1.5f * kWidth, 1.5f * kHeight), repeatPaint);
+                canvas->translate(1.5f * kWidth + kPad, 0);
             }
             canvas->restore();
             canvas->translate(0, kPad + 1.5f * kHeight * s);
         }
     }
 
 private:
     typedef GM INHERITED;
 };
 
 DEF_GM(return new RectangleTexture;)
 }
 
 #endif