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

src/utils/SkTextureCompressor.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 "SkTextureCompressor.h"
 #include "SkTextureCompressor_ASTC.h"
 #include "SkTextureCompressor_LATC.h"
@@ skipping 155 matching lines @@
         }
     }
 
     if (proc) {
         return proc(dst, src, width, height, rowBytes);
     }
 
     return false;
 }
 
-SkData* CompressBitmapToFormat(const SkPixmap& pixmap, Format format) {
-    int compressedDataSize = GetCompressedDataSize(format, pixmap.width(), pixmap.height());
+SkData* CompressBitmapToFormat(const SkBitmap &bitmap, Format format) {
+    SkAutoLockPixels alp(bitmap);
+
+    int compressedDataSize = GetCompressedDataSize(format, bitmap.width(), bitmap.height());
     if (compressedDataSize < 0) {
         return NULL;
     }
 
-    const uint8_t* src = reinterpret_cast<const uint8_t*>(pixmap.addr());
+    const uint8_t* src = reinterpret_cast<const uint8_t*>(bitmap.getPixels());
     SkData* dst = SkData::NewUninitialized(compressedDataSize);
 
-    if (!CompressBufferToFormat((uint8_t*)dst->writable_data(), src, pixmap.colorType(),
-                                pixmap.width(), pixmap.height(), pixmap.rowBytes(), format)) {
+    if (!CompressBufferToFormat((uint8_t*)dst->writable_data(), src, bitmap.colorType(),
+                                bitmap.width(), bitmap.height(), bitmap.rowBytes(), format)) {
         dst->unref();
         dst = NULL;
     }
     return dst;
 }
 
 SkBlitter* CreateBlitterForFormat(int width, int height, void* compressedBuffer,
                                   SkTBlitterAllocator *allocator, Format format) {
     switch(format) {
         case kLATC_Format:
@@ skipping 54 matching lines @@
 
         default:
             // Do nothing...
             break;
     }
 
     return false;
 }
 
 }  // namespace SkTextureCompressor