guarded change to SkImageGenerator to make getInfo() const

src/core/SkImageGenerator.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImageGenerator.h"
 
-bool SkImageGenerator::getInfo(SkImageInfo* info) {
-    SkImageInfo dummy;
-    if (NULL == info) {
-        info = &dummy;
+#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
+SkImageInfo SkImageGenerator::getInfo() {
+    SkImageInfo info;
+    if (!this->onGetInfo(&info)) {
+        info = SkImageInfo::MakeUnknown(0, 0);
     }
-    return this->onGetInfo(info);
+    return info;
 }
+#endif
 
 SkImageGenerator::Result SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels,
                                                      size_t rowBytes, const Options* options,
                                                      SkPMColor ctable[], int* ctableCount) {
     if (kUnknown_SkColorType == info.colorType()) {
         return kInvalidConversion;
     }
     if (NULL == pixels) {
         return kInvalidParameters;
     }
@@ skipping 86 matching lines @@
     }
     return this->onGetYUV8Planes(sizes, planes, rowBytes);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 SkData* SkImageGenerator::onRefEncodedData() {
     return NULL;
 }
 
+#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
 bool SkImageGenerator::onGetInfo(SkImageInfo*) {
     return false;
 }
+#endif
 
 #ifdef SK_SUPPORT_LEGACY_OPTIONLESS_GET_PIXELS
 SkImageGenerator::Result SkImageGenerator::onGetPixels(const SkImageInfo&, void*, size_t,
                                                        SkPMColor*, int*) {
     return kUnimplemented;
 }
 #endif
 
 SkImageGenerator::Result SkImageGenerator::onGetPixels(const SkImageInfo& info, void* dst,
                                                        size_t rb, const Options& options,
                                                        SkPMColor* colors, int* colorCount) {
 #ifdef SK_SUPPORT_LEGACY_OPTIONLESS_GET_PIXELS
     return this->onGetPixels(info, dst, rb, colors, colorCount);
 #else
     return kUnimplemented;
 #endif
 }