From b3f0ec9f9967da2f80f0d842cb7fd53617b48de3 Mon Sep 17 00:00:00 2001
From: reed <reed@chromium.org>
Date: Mon, 8 Jun 2015 19:58:07 -0700
Subject: Revert of change SkDraw and all Blitters to use pixmap instead of
 bitmap (patchset #6 id:100001 of https://codereview.chromium.org/1148793007/)

Reason for revert:
speculative revert to try to unblock DEPS roll

Original issue's description:
> change SkDraw and all Blitters to use pixmap instead of bitmap
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c31af44336f5eb4a50e83e76e51962d46c3ed458

TBR=scroggo@google.com,jvanverth@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1164373003
---
 bench/CoverageBench.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bench/CoverageBench.cpp')

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