Rename onGetPixelsEnum back to onGetPixels.

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) {
@@ skipping 22 matching lines @@
             return kInvalidParameters;
         }
     } else {
         if (ctableCount) {
             *ctableCount = 0;
         }
         ctableCount = NULL;
         ctable = NULL;
     }
 
-    const Result result = this->onGetPixelsEnum(info, pixels, rowBytes, ctable, ctableCount);
+    const Result result = this->onGetPixels(info, pixels, rowBytes, ctable, ctableCount);
 
     if ((kIncompleteInput == result || kSuccess == result) && ctableCount) {
         SkASSERT(*ctableCount >= 0 && *ctableCount <= 256);
     }
     return result;
 }
 
 SkImageGenerator::Result SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels,
                                                      size_t rowBytes) {
     SkASSERT(kIndex_8_SkColorType != info.colorType());
@@ skipping 58 matching lines @@
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 SkData* SkImageGenerator::onRefEncodedData() {
     return NULL;
 }
 
 bool SkImageGenerator::onGetInfo(SkImageInfo*) {
     return false;
 }
 
-#ifdef SK_SUPPORT_LEGACY_IMAGE_GENERATOR_RETURN
-bool SkImageGenerator::onGetPixels(const SkImageInfo&, void*, size_t,
+SkImageGenerator::Result SkImageGenerator::onGetPixels(const SkImageInfo&, void*, size_t,
                                                        SkPMColor*, int*) {
-    return false;
-}
-#endif
-SkImageGenerator::Result SkImageGenerator::onGetPixelsEnum(const SkImageInfo& info, void* pixels,
-                                                           size_t rowBytes, SkPMColor* colors,
-                                                           int* colorCount) {
-#ifdef SK_SUPPORT_LEGACY_IMAGE_GENERATOR_RETURN
-    if (this->onGetPixels(info, pixels, rowBytes, colors, colorCount)) {
-        return kSuccess;
-    }
-#endif
     return kUnimplemented;
 }