Enabling ico decoding with use of png and bmp decoders

src/codec/SkCodec_libpng.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCodec_libpng.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 350 matching lines @@
     return kPremul_SkAlphaType == dst.alphaType() &&
             kUnpremul_SkAlphaType == src.alphaType();
 }
 
 SkCodec::Result SkPngCodec::onGetPixels(const SkImageInfo& requestedInfo, void* dst,
                                         size_t rowBytes, const Options& options,
                                         SkPMColor ctable[], int* ctableCount) {
     if (!this->rewindIfNeeded()) {
         return kCouldNotRewind;
     }
-    if (requestedInfo.dimensions() != this->getOriginalInfo().dimensions()) {
+    if (requestedInfo.dimensions() != this->getInfo().dimensions()) {
         return kInvalidScale;
     }
-    if (!conversion_possible(requestedInfo, this->getOriginalInfo())) {
+    if (!conversion_possible(requestedInfo, this->getInfo())) {
         return kInvalidConversion;
     }
 
     SkBitmap decodedBitmap;
     // If installPixels would have failed, getPixels should have failed before
     // calling onGetPixels.
     SkAssertResult(decodedBitmap.installPixels(requestedInfo, dst, rowBytes));
 
     // Initialize all non-trivial objects before setjmp.
     SkAutoTUnref<SkColorTable> colorTable;
@@ skipping 32 matching lines @@
 
         if (at != requestedInfo.alphaType()) {
             // It turns out the image is opaque.
             SkASSERT(kOpaque_SkAlphaType == at);
         }
     } else if (kAlpha_8_SkColorType == requestedInfo.colorType()) {
         // Note: we check the destination, since otherwise we would have
         // told png to upscale.
         SkASSERT(PNG_COLOR_TYPE_GRAY == pngColorType);
         sc = SkSwizzler::kGray;
-    } else if (this->getOriginalInfo().alphaType() == kOpaque_SkAlphaType) {
+    } else if (this->getInfo().alphaType() == kOpaque_SkAlphaType) {
         sc = SkSwizzler::kRGBX;
     } else {
         sc = SkSwizzler::kRGBA;
     }
     const SkPMColor* colors = colorTable ? colorTable->readColors() : NULL;
     swizzler.reset(SkSwizzler::CreateSwizzler(sc, colors, requestedInfo,
                                               dst, rowBytes,
                                               options.fZeroInitialized));
     if (!swizzler) {
         // FIXME: CreateSwizzler could fail for another reason.
@@ skipping 42 matching lines @@
 
     // FIXME: do we need substituteTranspColor?
 
     if (reallyHasAlpha && requestedInfo.alphaType() != kOpaque_SkAlphaType) {
         // FIXME: We want to alert the caller. Is this the right way?
         SkImageInfo* modInfo = const_cast<SkImageInfo*>(&requestedInfo);
         *modInfo = requestedInfo.makeAlphaType(kOpaque_SkAlphaType);
     }
     return kSuccess;
 }