Port SkTextureCompression opts to SkOpts

src/utils/SkTextureCompressor.h

Index: src/utils/SkTextureCompressor.h
diff --git a/src/utils/SkTextureCompressor.h b/src/utils/SkTextureCompressor.h
index e31a5ab48d5262168dc0bdf11c400e0a64065167..f002cde3014c37a54b4341fd363f52af33277d46 100644
--- a/src/utils/SkTextureCompressor.h
+++ b/src/utils/SkTextureCompressor.h
@@ -55,7 +55,7 @@ namespace SkTextureCompressor {
     int GetCompressedDataSize(Format fmt, int width, int height);
 
     // Returns an SkData holding a blob of compressed data that corresponds
-    // to the pixmap. If the pixmap colorType cannot be compressed using the 
+    // to the pixmap. If the pixmap colorType cannot be compressed using the
     // associated format, then we return NULL. The caller is responsible for
     // calling unref() on the returned data.
     SkData* CompressBitmapToFormat(const SkPixmap&, Format format);
@@ -64,8 +64,7 @@ namespace SkTextureCompressor {
     // large enough to hold width*height pixels. The dst data is expected to
     // be large enough to hold the compressed data according to the format.
     bool CompressBufferToFormat(uint8_t* dst, const uint8_t* src, SkColorType srcColorType,
-                                int width, int height, size_t rowBytes, Format format,
-                                bool opt = true /* Use optimization if available */);
+                                int width, int height, size_t rowBytes, Format format);
 
     // Decompresses the given src data from the format specified into the
     // destination buffer. The width and height of the data passed corresponds
@@ -81,12 +80,6 @@ namespace SkTextureCompressor {
     bool DecompressBufferFromFormat(uint8_t* dst, int dstRowBytes, const uint8_t* src,
                                     int width, int height, Format format);
 
-    // This typedef defines what the nominal aspects of a compression function
-    // are. The typedef is not meant to be used by clients of the API, but rather
-    // allows SIMD optimized compression functions to be implemented.
-    typedef bool (*CompressionProc)(uint8_t* dst, const uint8_t* src,
-                                    int width, int height, size_t rowBytes);
-
     // Returns true if there exists a blitter for the specified format.
     inline bool ExistsBlitterForFormat(Format format) {
         switch (format) {