From 49f1f34438d3431f6d7e32847accd2ba96948a73 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 15 Sep 2017 11:37:15 -0400 Subject: use unique_ptr for stream api Bug: skia:6888 Change-Id: I3459b4913982a7cae1c0061697c82cc65ad9a2d8 Reviewed-on: https://skia-review.googlesource.com/26740 Reviewed-by: Mike Klein Commit-Queue: Mike Reed --- include/utils/SkFrontBufferedStream.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'include/utils') diff --git a/include/utils/SkFrontBufferedStream.h b/include/utils/SkFrontBufferedStream.h index 3532fc5259..a47acf8a06 100644 --- a/include/utils/SkFrontBufferedStream.h +++ b/include/utils/SkFrontBufferedStream.h @@ -8,10 +8,7 @@ #ifndef SkFrontBufferedStream_DEFINED #define SkFrontBufferedStream_DEFINED -#include "SkTypes.h" - -class SkStream; -class SkStreamRewindable; +#include "SkStream.h" /** * Specialized stream that buffers the first X bytes of a stream, @@ -36,6 +33,13 @@ public: * NULL on failure. The caller is required to delete when finished with * this object. */ - static SkStreamRewindable* Create(SkStream* stream, size_t minBufferSize); + static std::unique_ptr Make(std::unique_ptr stream, + size_t minBufferSize); + +#ifdef SK_SUPPORT_LEGACY_STREAM_API + static SkStreamRewindable* Create(SkStream* stream, size_t minBufferSize) { + return Make(std::unique_ptr(stream), minBufferSize).release(); + } +#endif }; #endif // SkFrontBufferedStream_DEFINED -- cgit v1.2.3