Remove SkImageGenerator pieces only for SkCodec.

src/lazy/SkCachingPixelRef.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCachingPixelRef.h"
 #include "SkBitmapCache.h"
 #include "SkRect.h"
@@ skipping 35 matching lines @@
     }
 
     const SkImageInfo& info = this->info();
     if (!SkBitmapCache::Find(
                 this->getGenerationID(), info.bounds(), &fLockedBitmap)) {
         // Cache has been purged, must re-decode.
         if (!fLockedBitmap.tryAllocPixels(info, fRowBytes)) {
             fErrorInDecoding = true;
             return false;
         }
+#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS
         const SkImageGenerator::Result result = fImageGenerator->getPixels(info,
                 fLockedBitmap.getPixels(), fRowBytes);
         switch (result) {
             case SkImageGenerator::kIncompleteInput:
             case SkImageGenerator::kSuccess:
                 break;
             default:
-                fErrorInDecoding = true;
-                return false;
+#else
+        if (!fImageGenerator->getPixels(info, fLockedBitmap.getPixels(), fRowBytes)) {
+#endif
+            fErrorInDecoding = true;
+            return false;
         }
         fLockedBitmap.setImmutable();
         SkBitmapCache::Add(this, info.bounds(), fLockedBitmap);
     }
 
     // Now bitmap should contain a concrete PixelRef of the decoded image.
     void* pixels = fLockedBitmap.getPixels();
     SkASSERT(pixels != NULL);
     rec->fPixels = pixels;
     rec->fColorTable = NULL;
     rec->fRowBytes = fLockedBitmap.rowBytes();
     return true;
 }
 
 void SkCachingPixelRef::onUnlockPixels() {
     fLockedBitmap.reset();
 }