Revert of Change SkDecodingImageGenerator API

tests/CachedDecodingPixelRefTest.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 "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
@@ skipping 128 matching lines @@
             }
         }
         bool comparePixels = (SkImageEncoder::kPNG_Type == type);
         compare_bitmaps(reporter, original, lazy, comparePixels);
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 static bool install_skCachingPixelRef(SkData* encoded, SkBitmap* dst) {
     return SkCachingPixelRef::Install(
-        SkDecodingImageGenerator::Create(
-            encoded, SkDecodingImageGenerator::Options()), dst);
+        SkNEW_ARGS(SkDecodingImageGenerator, (encoded)), dst);
 }
 static bool install_skDiscardablePixelRef(SkData* encoded, SkBitmap* dst) {
     // Use system-default discardable memory.
-    return SkInstallDiscardablePixelRef(
-        SkDecodingImageGenerator::Create(
-            encoded, SkDecodingImageGenerator::Options()), dst, NULL);
+    return SkDecodingImageGenerator::Install(encoded, dst, NULL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 /**
  *  This checks to see that a SkCachingPixelRef and a
  *  SkDiscardablePixelRef works as advertised with a
  *  SkDecodingImageGenerator.
  */
 DEF_TEST(DecodingImageGenerator, reporter) {
     test_three_encodings(reporter, install_skCachingPixelRef);
@@ skipping 42 matching lines @@
             return false;
         }
         char* bytePtr = static_cast<char*>(pixels);
         for (int y = 0; y < info.fHeight; ++y) {
             sk_memset32(reinterpret_cast<SkColor*>(bytePtr),
                         TestImageGenerator::Color(), info.fWidth);
             bytePtr += rowBytes;
         }
         return true;
     }
-
 private:
     const TestType fType;
     skiatest::Reporter* const fReporter;
 };
-
 void CheckTestImageGeneratorBitmap(skiatest::Reporter* reporter,
                                    const SkBitmap& bm) {
     REPORTER_ASSERT(reporter, TestImageGenerator::Width() == bm.width());
     REPORTER_ASSERT(reporter, TestImageGenerator::Height() == bm.height());
     SkAutoLockPixels autoLockPixels(bm);
     REPORTER_ASSERT(reporter, NULL != bm.getPixels());
     if (NULL == bm.getPixels()) {
         return;
     }
     int errors = 0;
@@ skipping 84 matching lines @@
     SkDiscardableMemoryPool* globalPool = SkGetGlobalDiscardableMemoryPool();
     // Only acts differently from NULL on a platform that has a
     // default discardable memory implementation that differs from the
     // global DM pool.
     CheckPixelRef(TestImageGenerator::kFailGetPixels_TestType,
                   reporter, kSkDiscardable_PixelRefType, globalPool);
     CheckPixelRef(TestImageGenerator::kSucceedGetPixels_TestType,
                   reporter, kSkDiscardable_PixelRefType, globalPool);
 }
 ////////////////////////////////////////////////////////////////////////////////