commit 069e484cc3b9518f115312c065a6f9c843b0839a
author Mike Reed <reed@google.com> Sun Jan 24 11:39:58 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sun Jan 24 17:39:15 2021 +0000
tree 061e791ca487f1b3d8949269889cafdf50c451e0
parent 568f0ae77834f0e3de83d9c482852ff4c1d68e4f

drawBitmap is deprecated

- starting to remove duplicate/unneeded benches

Change-Id: I4cd2e73b4e5d6664a99cc4a51f82436970d12eb6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358219
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

bench/DisplacementBench.cpp

diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp
index 991bfac..3f1fed2 100644
--- a/bench/DisplacementBench.cpp
+++ b/bench/DisplacementBench.cpp
@@ -33,15 +33,14 @@
     void makeBitmap() {
         const int w = this->isSmall() ? FILTER_WIDTH_SMALL : FILTER_WIDTH_LARGE;
         const int h = this->isSmall() ? FILTER_HEIGHT_SMALL : FILTER_HEIGHT_LARGE;
-        fBitmap.allocN32Pixels(w, h);
-        SkCanvas canvas(fBitmap);
-        canvas.clear(0x00000000);
+        auto surf = SkSurface::MakeRasterN32Premul(w, h);
         SkPaint paint;
         paint.setColor(0xFF884422);
 
         SkFont font;
         font.setSize(SkIntToScalar(96));
-        canvas.drawSimpleText("g", 1, SkTextEncoding::kUTF8, SkIntToScalar(15), SkIntToScalar(55), font, paint);
+        surf->getCanvas()->drawSimpleText("g", 1, SkTextEncoding::kUTF8, 15, 55, font, paint);
+        fImage = surf->makeImageSnapshot();
     }
 
     void makeCheckerboard() {
@@ -71,17 +70,14 @@
 
     void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
         canvas->save();
-        canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y),
-                                          SkIntToScalar(fBitmap.width()),
-                                          SkIntToScalar(fBitmap.height())));
-        canvas->drawBitmap(fBitmap, SkIntToScalar(x), SkIntToScalar(y), &paint);
+        canvas->clipIRect(fImage->bounds().makeOffset(x, y));
+        canvas->drawImage(fImage, SkIntToScalar(x), SkIntToScalar(y), &paint);
         canvas->restore();
     }
 
     inline bool isSmall() const { return fIsSmall; }
 
-    SkBitmap fBitmap;
-    sk_sp<SkImage> fCheckerboard;
+    sk_sp<SkImage> fImage, fCheckerboard;
 
 private:
     bool fInitialized;