diff options
| author |  Herb Derby <herb@google.com> | 2018-05-01 17:06:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-02 14:46:17 +0000 |
| commit | efe39bcfb82ddf8404b1df6f58809ff53dff4b99 (patch) | |
| tree | 95e76d1546488015f20adbfaf7e71b6c063924f7 /dm | |
| parent | 83e6a67b694cdaa24b22e65b82d05bacd4b669fa (diff) | |
Take sk_sp<SkDevice> instead of SkDevice*
Change-Id: I0b296bf5b80adc19758a3dc99160be9d2ed05680
Reviewed-on: https://skia-review.googlesource.com/125160
Commit-Queue: Herb Derby <herb@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Auto-Submit: Herb Derby <herb@google.com>
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DMSrcSink.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index bab344b1e5..e6db22bcdb 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -32,6 +32,7 @@ #include "SkImageInfoPriv.h" #include "SkLiteDL.h" #include "SkLiteRecorder.h" +#include "SkMakeUnique.h" #include "SkMallocPixelRef.h" #include "SkMultiPictureDocumentPriv.h" #include "SkMultiPictureDraw.h" @@ -1800,9 +1801,9 @@ ThreadedSink::ThreadedSink(SkColorType colorType, sk_sp<SkColorSpace> colorSpace Error ThreadedSink::draw(const Src& src, SkBitmap* dst, SkWStream* stream, SkString* str) const { this->allocPixels(src, dst); - std::unique_ptr<SkThreadedBMPDevice> device(new SkThreadedBMPDevice( - *dst, FLAGS_backendTiles, FLAGS_backendThreads, fExecutor.get())); - std::unique_ptr<SkCanvas> canvas(new SkCanvas(device.get())); + auto canvas = skstd::make_unique<SkCanvas>( + sk_make_sp<SkThreadedBMPDevice>( + *dst, FLAGS_backendTiles, FLAGS_backendThreads, fExecutor.get())); Error result = src.draw(canvas.get()); canvas->flush(); return result; |