Revert of Enabling ico decoding with use of png and bmp decoders

include/codec/SkCodec.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCodec_DEFINED
 #define SkCodec_DEFINED
 
@@ skipping 53 matching lines @@
      *  initially returns a non-opaque answer, but completing the decode
      *  reveals that the image is actually opaque.
      */
 #ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
     bool onGetInfo(SkImageInfo* info) SK_OVERRIDE {
         *info = fInfo;
         return true;
     }
 #endif
 
+    // Helper for subclasses.
+    const SkImageInfo& getOriginalInfo() { return fInfo; }
+
     virtual SkISize onGetScaledDimensions(float /* desiredScale */) const {
         // By default, scaling is not supported.
         return fInfo.dimensions();
     }
 
     virtual SkEncodedFormat onGetEncodedFormat() const = 0;
 
     /**
      *  If the stream was previously read, attempt to rewind.
      *  @returns:
@@ skipping 19 matching lines @@
     }
 
 private:
     const SkImageInfo       fInfo;
     SkAutoTDelete<SkStream> fStream;
     bool                    fNeedsRewind;
 
     typedef SkImageGenerator INHERITED;
 };
 #endif // SkCodec_DEFINED