guarded change to SkImageGenerator to make getInfo() const

src/codec/SkCodec.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.h"
 #include "SkData.h"
 #include "SkCodec_libbmp.h"
@@ skipping 27 matching lines @@
     return NULL;
 }
 
 SkCodec* SkCodec::NewFromData(SkData* data) {
     if (!data) {
         return NULL;
     }
     return NewFromStream(SkNEW_ARGS(SkMemoryStream, (data)));
 }
 
-SkCodec::SkCodec(const SkImageInfo& info, SkStream* stream)
-    : fInfo(info)
+SkCodec::SkCodec(const SkImageInfo& info, SkStream* stream) : INHERITED(info)

[scroggo, 2015/03/19 13:27:47]

nit: Shouldn't this go on the next line?

[reed1, 2015/03/19 15:20:46]

Done.

+    , fInfo(info)

[scroggo, 2015/03/19 13:27:47]

fInfo is no longer needed by SkCodec. We can instead call getInfo().

Taking it a step further, we no longer need
getOriginalInfo()
SkCodec::onGetInfo

[reed1, 2015/03/19 15:20:46]

I thought I would remove the (many) duplicates in subclasses *after* I'm able to
remove the compile-guard (since they are needed in the legacy case).

     , fStream(stream)
     , fNeedsRewind(false)
 {}
 
 bool SkCodec::rewindIfNeeded() {
     // Store the value of fNeedsRewind so we can update it. Next read will
     // require a rewind.
     const bool neededRewind = fNeedsRewind;
     fNeedsRewind = true;
     return !neededRewind || fStream->rewind();
 }