Revert of Add ETC1 format to SkTextureCompressor

src/gpu/GrSWMaskHelper.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrSWMaskHelper.h"
 
 #include "GrDrawState.h"
@@ skipping 22 matching lines @@
         SkXfermode::kSrc_Mode,      // kReplace_Op
     };
 
     return modeMap[op];
 }
 
 static inline GrPixelConfig fmt_to_config(SkTextureCompressor::Format fmt) {
     static const GrPixelConfig configMap[] = {
         kLATC_GrPixelConfig,       // kLATC_Format,
         kR11_EAC_GrPixelConfig,    // kR11_EAC_Format,
-        kETC1_GrPixelConfig,       // kETC1_Format,
         kASTC_12x12_GrPixelConfig  // kASTC_12x12_Format,
     };
     GR_STATIC_ASSERT(0 == SkTextureCompressor::kLATC_Format);
     GR_STATIC_ASSERT(1 == SkTextureCompressor::kR11_EAC_Format);
-    GR_STATIC_ASSERT(2 == SkTextureCompressor::kETC1_Format);
-    GR_STATIC_ASSERT(3 == SkTextureCompressor::kASTC_12x12_Format);
+    GR_STATIC_ASSERT(2 == SkTextureCompressor::kASTC_12x12_Format);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(configMap) == SkTextureCompressor::kFormatCnt);
 
     return configMap[fmt];
 }
 
 #if GR_COMPRESS_ALPHA_MASK
 static bool choose_compressed_fmt(const GrDrawTargetCaps* caps,
                                   SkTextureCompressor::Format *fmt) {
     if (NULL == fmt) {
         return false;
@@ skipping 257 matching lines @@
     maskMatrix.preConcat(drawState->getViewMatrix());
 
     drawState->addCoverageEffect(
                          GrSimpleTextureEffect::Create(texture,
                                                        maskMatrix,
                                                        GrTextureParams::kNone_FilterMode,
                                                        kPosition_GrCoordSet))->unref();
 
     target->drawSimpleRect(dstRect);
 }