From 026388a01864c74208ad57d1ba4f711602d101c6 Mon Sep 17 00:00:00 2001 From: scroggo Date: Wed, 10 Feb 2016 11:15:21 -0800 Subject: Make SkPicture/SkImageGenerator default to SkCodec Remove reference to SkImageDecoder from SkPicture. Make the default InstallPixelRefProc passed to CreateFromStream use SkImageGenerator::NewFromEncoded instead. Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator. Remove the old version that used SkImageDecoder. Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default now behaves lazily. Update all clients to use the default. Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly. BUG=skia:4691 BUG=skia:4290 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1671193002 Review URL: https://codereview.chromium.org/1671193002 --- dm/DMSrcSink.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'dm') diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 9a62362010..971e47fef1 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -40,11 +40,6 @@ DEFINE_bool(multiPage, false, "For document-type backends, render the source" " into multiple pages"); DEFINE_bool(RAW_threading, true, "Allow RAW decodes to run on multiple threads?"); -static bool lazy_decode_bitmap(const void* src, size_t size, SkBitmap* dst) { - SkAutoTUnref encoded(SkData::NewWithCopy(src, size)); - return encoded && SkDEPRECATED_InstallDiscardablePixelRef(encoded, dst); -} - namespace DM { GMSrc::GMSrc(skiagm::GMRegistry::Factory factory) : fFactory(factory) {} @@ -804,7 +799,7 @@ Error SKPSrc::draw(SkCanvas* canvas) const { if (!stream) { return SkStringPrintf("Couldn't read %s.", fPath.c_str()); } - SkAutoTUnref pic(SkPicture::CreateFromStream(stream, &lazy_decode_bitmap)); + SkAutoTUnref pic(SkPicture::CreateFromStream(stream)); if (!pic) { return SkStringPrintf("Couldn't decode %s as a picture.", fPath.c_str()); } @@ -1177,7 +1172,7 @@ Error ViaSerialization::draw( SkDynamicMemoryWStream wStream; pic->serialize(&wStream); SkAutoTDelete rStream(wStream.detachAsStream()); - SkAutoTUnref deserialized(SkPicture::CreateFromStream(rStream, &lazy_decode_bitmap)); + SkAutoTUnref deserialized(SkPicture::CreateFromStream(rStream)); return draw_to_canvas(fSink, bitmap, stream, log, size, [&](SkCanvas* canvas) { canvas->drawPicture(deserialized); -- cgit v1.2.3