Revert of Added test for non cached ETC1

gm/etc1bitmap.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 "gm.h"
 
 #include "Resources.h"
@@ skipping 66 matching lines @@
  */
 class ETC1BitmapGM : public GM {
 public:
     ETC1BitmapGM() { }
     virtual ~ETC1BitmapGM() { }
 
 protected:
     virtual SkString onShortName() SK_OVERRIDE {
         SkString str = SkString("etc1bitmap_");
         str.append(this->fileExtension());
-        if (this->isVolatile()) {
-            str.append("_volatile");
-        }
         return str;
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(128, 128);
     }
 
-    virtual bool isVolatile() const { return false; }
-
     virtual SkString fileExtension() const = 0;
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkBitmap bm;
         SkString filename = GetResourcePath("mandrill_128.");
         filename.append(this->fileExtension());
         SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(filename.c_str()));
         if (NULL == fileData) {
             SkDebugf("Could not open the file. Did you forget to set the resourcePath?\n");
             return;
         }
 
         if (!SkInstallDiscardablePixelRef(
                 SkDecodingImageGenerator::Create(
                     fileData, SkDecodingImageGenerator::Options()), &bm)) {
             SkDebugf("Could not install discardable pixel ref.\n");
             return;
         }
 
-        bm.setIsVolatile(this->isVolatile());
-
         canvas->drawBitmap(bm, 0, 0);
     }
 
 private:
     typedef GM INHERITED;
 };
 
 // This class specializes ETC1BitmapGM to load the mandrill_128.pkm file.
 class ETC1Bitmap_PKM_GM : public ETC1BitmapGM {
 public:
     ETC1Bitmap_PKM_GM() : ETC1BitmapGM() { }
     virtual ~ETC1Bitmap_PKM_GM() { }
 
 protected:
 
     virtual SkString fileExtension() const SK_OVERRIDE { return SkString("pkm"); }
 
 private:
     typedef ETC1BitmapGM INHERITED;
-};
-
-// This class specializes ETC1BitmapGM to load the mandrill_128.pkm file in a volatile bitmap.
-class ETC1Bitmap_PKM_VOLATILE_GM : public ETC1BitmapGM {
-public:
-    ETC1Bitmap_PKM_VOLATILE_GM() : ETC1BitmapGM() { }
-    virtual ~ETC1Bitmap_PKM_VOLATILE_GM() { }
-
-protected:
-
-    virtual SkString fileExtension() const SK_OVERRIDE { return SkString("pkm"); }
-    virtual bool isVolatile() const SK_OVERRIDE { return true; }
-
-private:
-    typedef ETC1BitmapGM INHERITED;
 };
 
 // This class specializes ETC1BitmapGM to load the mandrill_128.ktx file.
 class ETC1Bitmap_KTX_GM : public ETC1BitmapGM {
 public:
     ETC1Bitmap_KTX_GM() : ETC1BitmapGM() { }
     virtual ~ETC1Bitmap_KTX_GM() { }
 
 protected:
 
@@ skipping 75 matching lines @@
 private:
     typedef GM INHERITED;
 };
 #endif  // SK_IGNORE_ETC1_SUPPORT
 
 }  // namespace skiagm
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_PKM_GM); )
-DEF_GM( return SkNEW(skiagm::ETC1Bitmap_PKM_VOLATILE_GM); )
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_KTX_GM); )
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_R11_KTX_GM); )
 
 #ifndef SK_IGNORE_ETC1_SUPPORT
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_NPOT_GM); )
 #endif  // SK_IGNORE_ETC1_SUPPORT