From 7031b247c9fe0cb8fa32129f9bc24fea2043cee2 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 15 Sep 2017 21:03:54 +0000 Subject: Revert "use unique_ptr for stream api" This reverts commit 49f1f34438d3431f6d7e32847accd2ba96948a73. Reason for revert: broke win-chrome ../../third_party/skia/src/ports/SkFontMgr_win_dw.cpp(89): error C2228: left of '.release' must have class/struct/union ../../third_party/skia/src/ports/SkFontMgr_win_dw.cpp(89): note: type is 'SkStreamAsset *' ../../third_party/skia/src/ports/SkFontMgr_win_dw.cpp(89): note: did you intend to use '->' instead? Original change's description: > 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 TBR=mtklein@chromium.org,mtklein@google.com,bungeman@google.com,reed@google.com Change-Id: Ic1e4af557317abd06b7f6b7f5056645df7e469f0 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:6888 Reviewed-on: https://skia-review.googlesource.com/47440 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- tests/CodecTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/CodecTest.cpp') diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index f2551d2d95..baa231497f 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -442,10 +442,10 @@ static void check(skiatest::Reporter* r, #ifndef SK_PNG_DISABLE_TESTS // Test using SkFrontBufferedStream, as Android does - auto bufferedStream = SkFrontBufferedStream::Make( - SkMemoryStream::Make(std::move(fullData)), SkCodec::MinBufferedBytesNeeded()); + SkStream* bufferedStream = SkFrontBufferedStream::Create( + new SkMemoryStream(std::move(fullData)), SkCodec::MinBufferedBytesNeeded()); REPORTER_ASSERT(r, bufferedStream); - codec = SkCodec::MakeFromStream(std::move(bufferedStream)); + codec = SkCodec::MakeFromStream(std::unique_ptr(bufferedStream)); REPORTER_ASSERT(r, codec); if (codec) { test_info(r, codec.get(), info, SkCodec::kSuccess, &codecDigest); -- cgit v1.2.3