commit 41e010cb901c0da9066c4df562030808c9ccd7f8
author reed <reed@google.com> Tue Jun 09 12:16:53 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jun 09 12:16:53 2015 -0700
tree 3bf17e946f9eadd43040ea6968adcfa5f2f882a4
parent 1831f990c31bad0d84641663c96aa8eebf846ab9

Revert[2] SkDraw and all Blitters to use pixmap instead of bitmapi

This reverts commit b3f0ec9f9967da2f80f0d842cb7fd53617b48de3.

BUG=skia:

Review URL: https://codereview.chromium.org/1168303006

bench/CoverageBench.cpp

diff --git a/bench/CoverageBench.cpp b/bench/CoverageBench.cpp
index 96eafaa..135ef39 100644
--- a/bench/CoverageBench.cpp
+++ b/bench/CoverageBench.cpp
@@ -19,7 +19,7 @@
     SkString    fName;
     SkPath      fPath;
     SkRasterClip fRC;
-    SkBitmap    fBitmap;
+    SkAutoPixmapStorage fPixmap;
     SkMatrix    fIdentity;
     SkDraw      fDraw;
     bool        fDrawCoverage;
@@ -32,12 +32,12 @@
         fPath.quadTo(500, 0, 500, 500);
         fPath.quadTo(250, 0, 0, 500);
 
-        fBitmap.allocPixels(SkImageInfo::MakeA8(500, 500));
+        fPixmap.alloc(SkImageInfo::MakeA8(500, 500));
 
         fIdentity.setIdentity();
         fRC.setRect(fPath.getBounds().round());
 
-        fDraw.fBitmap   = &fBitmap;
+        fDraw.fDst      = fPixmap;
         fDraw.fMatrix   = &fIdentity;
         fDraw.fClip     = &fRC.bwRgn();
         fDraw.fRC       = &fRC;