Revert of - Add astcbitmap to gm slides

src/utils/SkTextureCompressor.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTextureCompressor_DEFINED
 #define SkTextureCompressor_DEFINED
 
@@ skipping 11 matching lines @@
         kR11_EAC_Format,    // 4x4 blocks, (de)compresses A8
 
         // RGB only formats
         kETC1_Format,       // 4x4 blocks, compresses RGB 565, decompresses 8-bit RGB
                             //    NOTE: ETC1 supports 8-bit RGB compression, but we
                             //    currently don't have any RGB8 SkColorTypes. We could
                             //    support 8-bit RGBA but we would have to preprocess the
                             //    bitmap to insert alphas.
 
         // Multi-purpose formats
-        kASTC_4x4_Format,   // 4x4 blocks, no compression, decompresses RGBA
-        kASTC_5x4_Format,   // 5x4 blocks, no compression, decompresses RGBA
-        kASTC_5x5_Format,   // 5x5 blocks, no compression, decompresses RGBA
-        kASTC_6x5_Format,   // 6x5 blocks, no compression, decompresses RGBA
-        kASTC_6x6_Format,   // 6x6 blocks, no compression, decompresses RGBA
-        kASTC_8x5_Format,   // 8x5 blocks, no compression, decompresses RGBA
-        kASTC_8x6_Format,   // 8x6 blocks, no compression, decompresses RGBA
-        kASTC_8x8_Format,   // 8x8 blocks, no compression, decompresses RGBA
-        kASTC_10x5_Format,  // 10x5 blocks, no compression, decompresses RGBA
-        kASTC_10x6_Format,  // 10x6 blocks, no compression, decompresses RGBA
-        kASTC_10x8_Format,  // 10x8 blocks, no compression, decompresses RGBA
-        kASTC_10x10_Format, // 10x10 blocks, no compression, decompresses RGBA
-        kASTC_12x10_Format, // 12x10 blocks, no compression, decompresses RGBA
         kASTC_12x12_Format, // 12x12 blocks, compresses A8, decompresses RGBA
 
         kLast_Format = kASTC_12x12_Format
     };
     static const int kFormatCnt = kLast_Format + 1;
 
     // Returns the size of the compressed data given the width, height, and
     // desired compression format. If the width and height are not an appropriate
     // multiple of the block size, then this function returns an error (-1).
     int GetCompressedDataSize(Format fmt, int width, int height);
@@ skipping 40 matching lines @@
     // Returns the desired dimensions of the block size for the given format. These dimensions
     // don't necessarily correspond to the specification's dimensions, since there may
     // be specialized algorithms that operate on multiple blocks at once. If the
     // flag 'matchSpec' is true, then the actual dimensions from the specification are
     // returned. If the flag is false, then these dimensions reflect the appropriate operable
     // dimensions of the compression functions.
     void GetBlockDimensions(Format format, int* dimX, int* dimY, bool matchSpec = false);
 }
 
 #endif