change SkDraw and all Blitters to use pixmap instead of bitmap

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 "GrPipelineBuilder.h"
@@ skipping 184 matching lines @@
             int cmpSz = SkTextureCompressor::GetCompressedDataSize(
                 fCompressedFormat, cmpWidth, cmpHeight);
 
             SkASSERT(cmpSz > 0);
             SkASSERT(NULL == fCompressedBuffer.get());
             fCompressedBuffer.reset(cmpSz);
             fCompressionMode = kBlitter_CompressionMode;
         }
     } 
 
+    sk_bzero(&fDraw, sizeof(fDraw));
+
     // If we don't have a custom blitter, then we either need a bitmap to compress
     // from or a bitmap that we're going to use as a texture. In any case, we should
     // allocate the pixels for a bitmap
     const SkImageInfo bmImageInfo = SkImageInfo::MakeA8(cmpWidth, cmpHeight);
     if (kBlitter_CompressionMode != fCompressionMode) {
         if (!fBM.tryAllocPixels(bmImageInfo)) {
             return false;
         }
-
         sk_bzero(fBM.getPixels(), fBM.getSafeSize());

[jvanverth1, 2015/06/08 13:21:10]

Add a comment explaining why we're peeking at the pixels (I'm guessing it's to
set up the pixmap)?

[reed1, 2015/06/08 17:00:22]

removed fBM

+        if (!fBM.peekPixels(&fDraw.fDst)) {
+            return false;
+        }
     } else {
         // Otherwise, we just need to remember how big the buffer is...
         fBM.setInfo(bmImageInfo);
+        fDraw.fDst.reset(bmImageInfo);
     }
-
-    sk_bzero(&fDraw, sizeof(fDraw));
-
     fRasterClip.setRect(bounds);
     fDraw.fRC    = &fRasterClip;
     fDraw.fClip  = &fRasterClip.bwRgn();
     fDraw.fMatrix = &fMatrix;
-    fDraw.fBitmap = &fBM;
     return true;
 }
 
 /**
  * Get a texture (from the texture cache) of the correct size & format.
  */
 GrTexture* GrSWMaskHelper::createTexture() {
     GrSurfaceDesc desc;
     desc.fWidth = fBM.width();
     desc.fHeight = fBM.height();
@@ skipping 135 matching lines @@
     maskMatrix.preTranslate(SkIntToScalar(-rect.fLeft), SkIntToScalar(-rect.fTop));
 
     pipelineBuilder->addCoverageProcessor(
                          GrSimpleTextureEffect::Create(texture,
                                                        maskMatrix,
                                                        GrTextureParams::kNone_FilterMode,
                                                        kDevice_GrCoordSet))->unref();
 
     target->drawBWRect(pipelineBuilder, color, SkMatrix::I(), dstRect, NULL, &invert);
 }