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

src/gpu/GrAADistanceFieldPathRenderer.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 "GrAADistanceFieldPathRenderer.h"
 
@@ skipping 336 matching lines @@
         drawMatrix.postScale(scale, scale);
         drawMatrix.postTranslate(kAntiAliasPad, kAntiAliasPad);
 
         // setup bitmap backing
         // Now translate so the bound's UL corner is at the origin
         drawMatrix.postTranslate(-devPathBounds.fLeft * SK_Scalar1,
                                  -devPathBounds.fTop * SK_Scalar1);
         SkIRect pathBounds = SkIRect::MakeWH(devPathBounds.width(),
                                              devPathBounds.height());
 
-        SkAutoPixmapStorage dst;
-        if (!dst.tryAlloc(SkImageInfo::MakeA8(pathBounds.width(),
-                                              pathBounds.height()))) {
+        SkBitmap bmp;
+        const SkImageInfo bmImageInfo = SkImageInfo::MakeA8(pathBounds.fRight,
+                                                            pathBounds.fBottom);
+        if (!bmp.tryAllocPixels(bmImageInfo)) {
             return false;
         }
-        sk_bzero(dst.writable_addr(), dst.getSafeSize());
+
+        sk_bzero(bmp.getPixels(), bmp.getSafeSize());
 
         // rasterize path
         SkPaint paint;
         if (stroke.isHairlineStyle()) {
             paint.setStyle(SkPaint::kStroke_Style);
             paint.setStrokeWidth(SK_Scalar1);
         } else {
             if (stroke.isFillStyle()) {
                 paint.setStyle(SkPaint::kFill_Style);
             } else {
                 paint.setStyle(SkPaint::kStroke_Style);
                 paint.setStrokeJoin(stroke.getJoin());
                 paint.setStrokeCap(stroke.getCap());
                 paint.setStrokeWidth(stroke.getWidth());
             }
         }
         paint.setAntiAlias(antiAlias);
 
         SkDraw draw;
         sk_bzero(&draw, sizeof(draw));
 
         SkRasterClip rasterClip;
         rasterClip.setRect(pathBounds);
         draw.fRC = &rasterClip;
         draw.fClip = &rasterClip.bwRgn();
         draw.fMatrix = &drawMatrix;
-        draw.fDst = dst;
+        draw.fBitmap = &bmp;
 
         draw.drawPathCoverage(path, paint);
 
         // generate signed distance field
         devPathBounds.outset(SK_DistanceFieldPad, SK_DistanceFieldPad);
         int width = devPathBounds.width();
         int height = devPathBounds.height();
         // TODO We should really generate this directly into the plot somehow
         SkAutoSMalloc<1024> dfStorage(width * height * sizeof(unsigned char));
 
         // Generate signed distance field
-        SkGenerateDistanceFieldFromA8Image((unsigned char*)dfStorage.get(),
-                                           (const unsigned char*)dst.addr(),
-                                           dst.width(), dst.height(), dst.rowBytes());
+        {
+            SkAutoLockPixels alp(bmp);
+
+            SkGenerateDistanceFieldFromA8Image((unsigned char*)dfStorage.get(),
+                                               (const unsigned char*)bmp.getPixels(),
+                                               bmp.width(), bmp.height(), bmp.rowBytes());
+        }
 
         // add to atlas
         SkIPoint16 atlasLocation;
         GrBatchAtlas::AtlasID id;
         bool success = atlas->addToAtlas(&id, batchTarget, width, height, dfStorage.get(),
                                          &atlasLocation);
         if (!success) {
             this->flush(batchTarget, flushInfo);
             batchTarget->initDraw(dfProcessor, pipeline);
 
@@ skipping 238 matching lines @@
     geometry.fPath = GrTest::TestPath(random);
     geometry.fAntiAlias = random->nextBool();
 
     return AADistanceFieldPathBatch::Create(geometry, color, viewMatrix,
                                             gTestStruct.fAtlas,
                                             &gTestStruct.fPathCache,
                                             &gTestStruct.fPathList);
 }
 
 #endif