diff options
| author |  reed <reed@google.com> | 2016-03-23 18:59:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-23 18:59:25 -0700 |
| commit | e8f3062a36d3682f4019309a32b5b84dc9eddf8c (patch) | |
| tree | ff5cd50c65edb6e3b77f77327165ad0162557137 /gm/srcmode.cpp | |
| parent | 041c870425eb0a3e2b0cbc46581b3da2f50571d9 (diff) | |
switch surface to sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1817383002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1817383002
Diffstat (limited to 'gm/srcmode.cpp')
| -rw-r--r-- | gm/srcmode.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp index 28bb04bd4e..93a9bc7f05 100644 --- a/gm/srcmode.cpp +++ b/gm/srcmode.cpp @@ -115,7 +115,7 @@ protected: } } - static SkSurface* compat_surface(SkCanvas* canvas, const SkISize& size, bool skipGPU) { + static sk_sp<SkSurface> compat_surface(SkCanvas* canvas, const SkISize& size, bool skipGPU) { SkImageInfo info = SkImageInfo::MakeN32Premul(size); bool callNewSurface = true; @@ -124,17 +124,16 @@ protected: callNewSurface = false; } #endif - SkSurface* surface = callNewSurface ? canvas->newSurface(info) : nullptr; + sk_sp<SkSurface> surface = callNewSurface ? canvas->makeSurface(info) : nullptr; if (nullptr == surface) { // picture canvas will return null, so fall-back to raster - surface = SkSurface::NewRaster(info); + surface = SkSurface::MakeRaster(info); } return surface; } virtual void onDraw(SkCanvas* canvas) { - SkAutoTUnref<SkSurface> surf(compat_surface(canvas, this->getISize(), - this->isCanvasDeferred())); + auto surf(compat_surface(canvas, this->getISize(), this->isCanvasDeferred())); surf->getCanvas()->drawColor(SK_ColorWHITE); this->drawContent(surf->getCanvas()); surf->draw(canvas, 0, 0, nullptr); |