aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/utils
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-09-15 11:37:15 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-15 18:46:45 +0000
commit49f1f34438d3431f6d7e32847accd2ba96948a73 (patch)
treec4e0342c3350c546573fb2add99597e92c9ca66c /include/utils
parent226e2032e8e37068a409aeb37aac79608fbd315d (diff)
use unique_ptr for stream api
Bug: skia:6888 Change-Id: I3459b4913982a7cae1c0061697c82cc65ad9a2d8 Reviewed-on: https://skia-review.googlesource.com/26740 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/utils')
-rw-r--r--include/utils/SkFrontBufferedStream.h14
1 files changed, 9 insertions, 5 deletions
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<SkStreamRewindable> Make(std::unique_ptr<SkStream> stream,
+ size_t minBufferSize);
+
+#ifdef SK_SUPPORT_LEGACY_STREAM_API
+ static SkStreamRewindable* Create(SkStream* stream, size_t minBufferSize) {
+ return Make(std::unique_ptr<SkStream>(stream), minBufferSize).release();
+ }
+#endif
};
#endif // SkFrontBufferedStream_DEFINED