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/multipicturedraw.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/multipicturedraw.cpp')
-rw-r--r-- | gm/multipicturedraw.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index a4b09b2c2f..03934a601d 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -241,15 +241,14 @@ static sk_sp<SkPicture> make_sierpinski_picture() { return recorder.finishRecordingAsPicture(); } -static SkSurface* create_compat_surface(SkCanvas* canvas, int width, int height) { +static sk_sp<SkSurface> create_compat_surface(SkCanvas* canvas, int width, int height) { SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); - SkSurface* surface = canvas->newSurface(info); + auto surface = canvas->makeSurface(info); if (nullptr == surface) { // picture canvas returns nullptr so fall back to raster - surface = SkSurface::NewRaster(info); + surface = SkSurface::MakeRaster(info); } - return surface; } @@ -257,13 +256,12 @@ static SkSurface* create_compat_surface(SkCanvas* canvas, int width, int height) // fragments potentially generated by the MultiPictureDraw object class ComposeStep { public: - ComposeStep() : fSurf(nullptr), fX(0.0f), fY(0.0f), fPaint(nullptr) { } + ComposeStep() : fX(0.0f), fY(0.0f), fPaint(nullptr) { } ~ComposeStep() { - SkSafeUnref(fSurf); delete fPaint; } - SkSurface* fSurf; + sk_sp<SkSurface> fSurf; SkScalar fX; SkScalar fY; SkPaint* fPaint; |