Remove SkImageGenerator pieces only for SkCodec.

src/lazy/SkCachingPixelRef.cpp

Index: src/lazy/SkCachingPixelRef.cpp
diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp
index 5fc0d2a87fa7180e88ed3404c175ee0750cf2f5e..31f23ec2fe0758cbcb94143bd632c25e2a697c17 100644
--- a/src/lazy/SkCachingPixelRef.cpp
+++ b/src/lazy/SkCachingPixelRef.cpp
@@ -53,6 +53,7 @@ bool SkCachingPixelRef::onNewLockPixels(LockRec* rec) {
             fErrorInDecoding = true;
             return false;
         }
+#ifdef SK_LEGACY_IMAGE_GENERATOR_ENUMS_AND_OPTIONS
         const SkImageGenerator::Result result = fImageGenerator->getPixels(info,
                 fLockedBitmap.getPixels(), fRowBytes);
         switch (result) {
@@ -60,8 +61,11 @@ bool SkCachingPixelRef::onNewLockPixels(LockRec* rec) {
             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);