discardable pixelrefs are gone, update tests accordingly

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 132 matching lines @@
             }
         }
     }
 
     void onPreDraw() override {
         if (nullptr == fPKMData) {
             SkDebugf("Failed to load PKM data!\n");
             return;
         }
 
-        // Install pixel ref
-        if (!SkInstallDiscardablePixelRef(fPKMData, &(this->fBitmap))) {
-            SkDebugf("Could not install discardable pixel ref.\n");
-            return;
-        }
-
-        // Decompress it if necessary
-        if (this->fDecompress) {
-            this->fBitmap.lockPixels();
+        if (fDecompress) {
+            SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(fPKMData));
+            gen->generateBitmap(&fBitmap);
+        } else {
+            fImage.reset(SkImage::NewFromEncoded(fPKMData));
         }
     }
 
     void onDraw(const int loops, SkCanvas* canvas) override {
         for (int i = 0; i < loops; ++i) {
-            canvas->drawBitmap(this->fBitmap, 0, 0, nullptr);
+            if (fDecompress) {
+                canvas->drawBitmap(this->fBitmap, 0, 0, nullptr);
+            } else {
+                canvas->drawImage(fImage, 0, 0, nullptr);
+            }
         }
     }
 
 protected:
     SkBitmap fBitmap;
+    SkAutoTUnref<SkImage> fImage;
+
     bool decompress() const { return fDecompress; }
     Backend backend() const { return fBackend; }
 private:
     const bool fDecompress;
     const Backend fBackend;
     typedef ETCBitmapBenchBase INHERITED;
 };
 
 // This benchmark is identical to the previous benchmark, but it explicitly forces
 // an upload to the GPU before each draw call. We do this by notifying the bitmap
@@ skipping 41 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