SkCodec: conditionally remove fInfo

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 91 matching lines @@
      */
 #ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
     bool onGetInfo(SkImageInfo* info) SK_OVERRIDE {
         *info = fInfo;
         return true;
     }
 #endif
 
     virtual SkISize onGetScaledDimensions(float /* desiredScale */) const {
         // By default, scaling is not supported.
+#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
         return fInfo.dimensions();
+#else
+        return this->getInfo().dimensions();
+#endif
     }
 
     virtual SkEncodedFormat onGetEncodedFormat() const = 0;
 
     /**
      *  Override if your codec supports scanline decoding.
      *
      *  No need to call rewindIfNeeded(), which will have already been called
      *  by the base class.
      *
@@ skipping 26 matching lines @@
     /*
      *
      * Get method for the input stream
      *
      */
     SkStream* stream() {
         return fStream.get();
     }
 
 private:
+#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
     const SkImageInfo                   fInfo;
+#endif  //  SK_SUPPORT_LEGACY_BOOL_ONGETINFO
     SkAutoTDelete<SkStream>             fStream;
     bool                                fNeedsRewind;
     SkAutoTDelete<SkScanlineDecoder>    fScanlineDecoder;
 
     typedef SkImageGenerator INHERITED;
 };
 #endif // SkCodec_DEFINED