switch surface to sk_sp

bench/SKPBench.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 "SKPBench.h"
 #include "SkCommandLineFlags.h"
 #include "SkMultiPictureDraw.h"
@@ skipping 54 matching lines @@
 
     fSurfaces.setReserve(xTiles * yTiles);
     fTileRects.setReserve(xTiles * yTiles);
 
     SkImageInfo ii = canvas->imageInfo().makeWH(tileW, tileH);
 
     for (int y = bounds.fTop; y < bounds.fBottom; y += tileH) {
         for (int x = bounds.fLeft; x < bounds.fRight; x += tileW) {
             const SkIRect tileRect = SkIRect::MakeXYWH(x, y, tileW, tileH);
             *fTileRects.append() = tileRect;
-            *fSurfaces.push() = canvas->newSurface(ii);
+            *fSurfaces.push() = canvas->makeSurface(ii).release();
 
             // Never want the contents of a tile to include stuff the parent
             // canvas clips out
             SkRect clip = SkRect::Make(bounds);
             clip.offset(-SkIntToScalar(tileRect.fLeft), -SkIntToScalar(tileRect.fTop));
             fSurfaces.top()->getCanvas()->clipRect(clip);
 
             fSurfaces.top()->getCanvas()->setMatrix(canvas->getTotalMatrix());
             fSurfaces.top()->getCanvas()->scale(fScale, fScale);
         }
@@ skipping 104 matching lines @@
     context->freeGpuResources();
     context->resetContext();
     context->getGpu()->resetShaderCacheForTesting();
     draw_pic_for_stats(canvas, context, fPic, keys, values, "first_frame");
 
     // draw second frame
     draw_pic_for_stats(canvas, context, fPic, keys, values, "second_frame");
 
 #endif
 }