add ImageGenerator::NewFromData to porting layer

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"
 #include "SkData.h"
-#include "SkDecodingImageGenerator.h"
+#include "SkImageGenerator.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
 #include "SkPixelRef.h"
 
 #ifndef SK_IGNORE_ETC1_SUPPORT
 
 #include "etc1.h"
 
 // This takes the etc1 data pointed to by orig, and copies it `factor` times in each
 // dimension. The return value is the new data or NULL on error.
@@ skipping 121 matching lines @@
         }
     }
 
     virtual void onPreDraw() SK_OVERRIDE {
         if (NULL == fPKMData) {
             SkDebugf("Failed to load PKM data!\n");
             return;
         }
 
         // Install pixel ref
-        if (!SkInstallDiscardablePixelRef(
-                SkDecodingImageGenerator::Create(
-                    fPKMData, SkDecodingImageGenerator::Options()), &(this->fBitmap))) {
+        if (!SkInstallDiscardablePixelRef(fPKMData, &(this->fBitmap))) {
             SkDebugf("Could not install discardable pixel ref.\n");
             return;
         }
 
         // Decompress it if necessary
         if (this->fDecompress) {
             this->fBitmap.lockPixels();
         }
     }
 
@@ skipping 59 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