Revert of Make SkPicture/SkImageGenerator default to SkCodec

bench/ETCBitmapBench.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 "Benchmark.h"
 #include "Resources.h"
 #include "SkCanvas.h"
@@ skipping 55 matching lines @@
     for (etc1_uint32 j = 0; j < newBlocksY; ++j) {
         const etc1_byte* rowStart = origData + ((j % origBlocksY) * origRowSzInBytes);
         for(etc1_uint32 i = 0; i < newWidth; i += origWidth) {
             memcpy(copyInto, rowStart, origRowSzInBytes);
             copyInto += origRowSzInBytes;
         }
     }
     return newData;
 }
 
-// Defined in SkImageDecoder_ktx.cpp
-extern SkImageGenerator* decoder_image_generator(SkData*);
-
 // This is the base class for all of the benches in this file. In general
 // the ETC1 benches should all be working on the same data. Due to the
 // simplicity of the PKM file, that data is the 128x128 mandrill etc1
 // compressed texture repeated by some factor (currently 8 -> 1024x1024)
 class ETCBitmapBenchBase : public Benchmark {
 public:
     ETCBitmapBenchBase() : fPKMData(loadPKM()) {
         if (nullptr == fPKMData) {
             SkDebugf("Could not load PKM data!\n");
         }
@@ skipping 58 matching lines @@
         }
     }
 
     void onDelayedSetup() override {
         if (nullptr == fPKMData) {
             SkDebugf("Failed to load PKM data!\n");
             return;
         }
 
         if (fDecompress) {
-            SkAutoTDelete<SkImageGenerator> gen(decoder_image_generator(fPKMData));
+            SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(fPKMData));
             gen->generateBitmap(&fBitmap);
         } else {
-            fImage.reset(SkImage::NewFromGenerator(decoder_image_generator(fPKMData)));
+            fImage.reset(SkImage::NewFromEncoded(fPKMData));
         }
     }
 
     void onDraw(int loops, SkCanvas* canvas) override {
         for (int i = 0; i < loops; ++i) {
             if (fDecompress) {
                 canvas->drawBitmap(this->fBitmap, 0, 0, nullptr);
             } else {
                 canvas->drawImage(fImage, 0, 0, nullptr);
             }
@@ skipping 58 matching lines @@
 DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kGPU_Backend);)
 DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kGPU_Backend);)
 
 DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kRaster_Backend);)
 DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kRaster_Backend);)
 
 DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kGPU_Backend);)
 DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kGPU_Backend);)
 
 #endif  // SK_IGNORE_ETC1_SUPPORT