switch surface to sk_sp

gm/discard.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkColorShader.h"
@@ skipping 27 matching lines @@
     void onDraw(SkCanvas* canvas) override {
         GrContext* context = canvas->getGrContext();
         if (nullptr == context) {
             return;
         }
 
         SkISize size = this->getISize();
         size.fWidth /= 10;
         size.fHeight /= 10;
         SkImageInfo info = SkImageInfo::MakeN32Premul(size);
-        SkSurface* surface = SkSurface::NewRenderTarget(context, SkBudgeted::kNo, info);
-
+        auto surface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info);
         if (nullptr == surface) {
             return;
         }
 
         canvas->clear(SK_ColorBLACK);
 
         SkRandom rand;
         for (int x = 0; x < 10; ++x) {
             for (int y = 0; y < 10; ++y) {
               surface->getCanvas()->discard();
@@ skipping 11 matching lines @@
                       SkPaint paint;
                       paint.setShader(&shader);
                       surface->getCanvas()->drawPaint(paint);
                       break;
               }
               surface->draw(canvas, 10.f*x, 10.f*y, nullptr);
             }
         }
 
         surface->getCanvas()->discard();
-        surface->unref();
     }
 
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new DiscardGM;)
 
 } // end namespace
 
 #endif