Enabling ico decoding with use of png and bmp decoders

dm/DMSrcSink.cpp

 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCommonFlags.h"
 #include "SkCodec.h"
 #include "SkDocument.h"
 #include "SkError.h"
 #include "SkMultiPictureDraw.h"
 #include "SkNullCanvas.h"
 #include "SkOSFile.h"
 #include "SkPictureData.h"
@@ skipping 123 matching lines @@
                 return Error::Nonfatal("Uninteresting to decode image with alpha into 565.");
             }
             canvas->drawBitmap(subset, SkIntToScalar(x), SkIntToScalar(y));
         }
     }
     return "";
 }
 
 SkISize ImageSrc::size() const {
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
+    SkDebugf("\n%s\n", fPath.c_str());

[msarett, 2015/03/20 18:35:57]

Ignore this.  I will remove.

     if (FLAGS_codec) {
         SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
         if (!codec) {
             return SkISize::Make(0,0);
         }
         SkImageInfo info;
         if (!codec->getInfo(&info)) {
             return SkISize::Make(0,0);
         }
         return info.dimensions();
@@ skipping 403 matching lines @@
             surfaces.unrefAll();
             return "";
         }
         SkISize size() const SK_OVERRIDE { return fSize; }
         Name name() const SK_OVERRIDE { sk_throw(); return ""; }  // No one should be calling this.
     } proxy(fW, fH, pic, src.size());
     return fSink->draw(proxy, bitmap, stream, log);
 }
 
 }  // namespace DM