From 7f7ec206de39fde8dc490e9feb0f65322af1b989 Mon Sep 17 00:00:00 2001 From: msarett Date: Tue, 1 Mar 2016 12:12:27 -0800 Subject: Fix bug in SkGifCodec / Switch SkImageDec tests to use Codec SkImageDecoder is still used throughout tests, tools, gms etc. Deleting it from tests is an easy first step. Bonus is that we add tests of SkCodec. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1733863003 Review URL: https://codereview.chromium.org/1733863003 --- tests/FrontBufferedStreamTest.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/FrontBufferedStreamTest.cpp') diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp index 7821c5e40d..e3df466fd3 100644 --- a/tests/FrontBufferedStreamTest.cpp +++ b/tests/FrontBufferedStreamTest.cpp @@ -6,8 +6,8 @@ */ #include "SkBitmap.h" +#include "SkCodec.h" #include "SkFrontBufferedStream.h" -#include "SkImageDecoder.h" #include "SkRefCnt.h" #include "SkStream.h" #include "SkTypes.h" @@ -289,11 +289,9 @@ private: DEF_TEST(ShortFrontBufferedStream, reporter) { FailingStream* failingStream = new FailingStream; SkAutoTDelete stream(SkFrontBufferedStream::Create(failingStream, 64)); - SkBitmap bm; - // The return value of DecodeStream is not important. We are just using DecodeStream because - // it simulates a bug. DecodeStream will read the stream, then rewind, then attempt to read - // again. FrontBufferedStream::read should not continue to read its underlying stream beyond - // its end. - SkImageDecoder::DecodeStream(stream, &bm); + + // This will fail to create a codec. However, what we really want to test is that we + // won't read past the end of the stream. + SkAutoTDelete codec(SkCodec::NewFromStream(stream.detach())); REPORTER_ASSERT(reporter, !failingStream->readAfterEnd()); } -- cgit v1.2.3