Revert of change SkDraw and all Blitters to use pixmap instead of bitmap

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 37 matching lines @@
         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);
 
     // 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 bitmap. If the bitmap 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);
+    SkData* CompressBitmapToFormat(const SkBitmap& bitmap, Format format);
 
     // Compresses the given src data into dst. The src data is assumed to be
     // 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 */);
 
     // Decompresses the given src data from the format specified into the
     // destination buffer. The width and height of the data passed corresponds
@@ skipping 37 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