Revert of Add ETC1 format to SkTextureCompressor

tests/TextureCompressionTest.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 "SkBitmap.h"
 #include "SkData.h"
 #include "SkEndian.h"
@@ skipping 114 matching lines @@
     SkAutoMalloc decompMemory(kWidth*kHeight);
     uint8_t* decompBuffer = reinterpret_cast<uint8_t*>(decompMemory.get());
     REPORTER_ASSERT(reporter, NULL != decompBuffer);
     if (NULL == decompBuffer) {
         return;
     }
 
     for (int i = 0; i < SkTextureCompressor::kFormatCnt; ++i) {
         const SkTextureCompressor::Format fmt = static_cast<SkTextureCompressor::Format>(i);
 
-        // Ignore formats for RGBA data, since the decompressed buffer
+        // ASTC is for RGBA data, and the decompressed buffer
         // won't match the size and contents of the original.
         // TODO: Create separate tests for RGB and RGBA data once
-        // ASTC and ETC1 decompression is implemented.
-        if (SkTextureCompressor::kASTC_12x12_Format == fmt ||
-            SkTextureCompressor::kETC1_Format == fmt) {
+        // ASTC decompression is implemented.
+        if (SkTextureCompressor::kASTC_12x12_Format == fmt) {
             continue;
         }
 
         SkAutoDataUnref data(SkTextureCompressor::CompressBitmapToFormat(bitmap, fmt));
         REPORTER_ASSERT(reporter, NULL != data);
         if (NULL == data) {
             continue;
         }
 
         bool decompResult =
@@ skipping 87 matching lines @@
                 (kIndex << 28) | (kIndex << 31) | (kIndex << 34) | (kIndex << 37) |
                 (kIndex << 40) | (kIndex << 43) | (kIndex << 46) | (kIndex << 49) |
                 (kIndex << 52) | (kIndex << 55) | (kIndex << 58) | (kIndex << 61));
 
         const uint64_t* blockPtr = reinterpret_cast<const uint64_t*>(latcData->data());
         for (size_t i = 0; i < (kSizeToBe/8); ++i) {
             REPORTER_ASSERT(reporter, blockPtr[i] == kConstColorEncoding);
         }
     }
 }