Remove SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS

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::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
@@ skipping 13 matching lines @@
             return false;
         }
     } else {
         if (ctableCount) {
             *ctableCount = 0;
         }
         ctableCount = NULL;
         ctable = NULL;
     }
 
-#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS
-    // Default options.
-    Options options;
-    const Result result = this->onGetPixels(info, pixels, rowBytes, options, ctable, ctableCount);
-
-    if (kIncompleteInput != result && kSuccess != result) {
-        return false;
-    }
-    if (ctableCount) {
-        SkASSERT(*ctableCount >= 0 && *ctableCount <= 256);
-    }
-        return true;
-#else
     const bool success = this->onGetPixels(info, pixels, rowBytes, ctable, ctableCount);
     if (success && ctableCount) {
         SkASSERT(*ctableCount >= 0 && *ctableCount <= 256);
     }
     return success;
-#endif
 }
 
 bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) {
     SkASSERT(kIndex_8_SkColorType != info.colorType());
     if (kIndex_8_SkColorType == info.colorType()) {
         return false;
     }
     return this->getPixels(info, pixels, rowBytes, NULL, NULL);
 }
 
@@ skipping 48 matching lines @@
     }
     return this->onGetYUV8Planes(sizes, planes, rowBytes);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 SkData* SkImageGenerator::onRefEncodedData() {
     return NULL;
 }
 
-#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS
-SkImageGenerator::Result SkImageGenerator::onGetPixels(const SkImageInfo& info, void* dst,
-                                                       size_t rb, const Options& options,
-                                                       SkPMColor* colors, int* colorCount) {
-    return kUnimplemented;
-}
-#else
 bool SkImageGenerator::onGetPixels(const SkImageInfo& info, void* dst, size_t rb,
                                    SkPMColor* colors, int* colorCount) {
     return false;
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "SkGraphics.h"
 
 static SkGraphics::ImageGeneratorFromEncodedFactory gFactory;
 
 SkGraphics::ImageGeneratorFromEncodedFactory
 SkGraphics::SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory factory)
 {
     ImageGeneratorFromEncodedFactory prev = gFactory;
     gFactory = factory;
     return prev;
 }
 
 SkImageGenerator* SkImageGenerator::NewFromEncoded(SkData* data) {
     if (NULL == data) {
         return NULL;
     }
     if (gFactory) {
         if (SkImageGenerator* generator = gFactory(data)) {
             return generator;
         }
     }
     return SkImageGenerator::NewFromEncodedImpl(data);
 }