From 7aa846c6837f527067e7ab5fdeacdbd502696382 Mon Sep 17 00:00:00 2001 From: tomhudson Date: Tue, 24 Mar 2015 13:47:41 -0700 Subject: Revert of Enabling ico decoding with use of png and bmp decoders (patchset #10 id:280001 of https://codereview.chromium.org/1011343003/) Reason for revert: Reverting on suspicion of massive bot failures - possible command line too long? Original issue's description: > Enabling ico decoding with use of png and bmp decoders > > BUG=skia:3257 > > Committed: https://skia.googlesource.com/skia/+/15bfd075d38e4422a477e22940d06a137f66cc97 TBR=scroggo@google.com,reed@google.com,djsollen@google.com,msarett@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:3257 Review URL: https://codereview.chromium.org/1022843005 --- dm/DMSrcSink.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'dm/DMSrcSink.cpp') diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index fe31d61ef0..638f670834 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -88,11 +88,7 @@ Error CodecSrc::draw(SkCanvas* canvas) const { SkISize CodecSrc::size() const { SkAutoTUnref encoded(SkData::NewFromFileName(fPath.c_str())); SkAutoTDelete codec(SkCodec::NewFromData(encoded)); - if (NULL != codec) { - return codec->getInfo().dimensions(); - } else { - return SkISize::Make(0, 0); - } + return codec->getInfo().dimensions(); } Name CodecSrc::name() const { -- cgit v1.2.3