commit 6dbeac51b44b5c4237a552d43e1c37902d6f98c9
author Mike Reed <reed@google.com> Wed Jan 13 13:14:23 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 13 19:40:45 2021 +0000
tree 6a7b5aae37217b7a5ce1faa4aae00f0e5e6b3e76
parent b60255033ddeb6a7e80f5699b0883b580d30dcbf

Begin to hide drawBitmap

... now that bitmap
- converts to image with just bitmap.asImage()
- canvas *always* converts bitmaps to images before they are drawn

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

gm/bitmaprect.cpp

diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index e840b81..474c8c5 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -16,22 +16,24 @@
 #include "include/core/SkShader.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkString.h"
+#include "include/core/SkSurface.h"
 #include "include/core/SkTileMode.h"
 #include "include/core/SkTypes.h"
 #include "include/effects/SkGradientShader.h"
 
-static void make_bitmap(SkBitmap* bitmap) {
-    bitmap->allocN32Pixels(64, 64);
+static sk_sp<SkImage> make_image() {
+    auto surf = SkSurface::MakeRasterN32Premul(64, 64);
+    auto canvas = surf->getCanvas();
 
-    SkCanvas canvas(*bitmap);
-
-    canvas.drawColor(SK_ColorRED);
+    canvas->drawColor(SK_ColorRED);
     SkPaint paint;
     paint.setAntiAlias(true);
     const SkPoint pts[] = { { 0, 0 }, { 64, 64 } };
     const SkColor colors[] = { SK_ColorWHITE, SK_ColorBLUE };
     paint.setShader(SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkTileMode::kClamp));
-    canvas.drawCircle(32, 32, 32, paint);
+    canvas->drawCircle(32, 32, 32, paint);
+
+    return surf->makeImageSnapshot();
 }
 
 class DrawBitmapRect2 : public skiagm::GM {
@@ -64,8 +66,7 @@
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
 
-        SkBitmap bitmap;
-        make_bitmap(&bitmap);
+        auto image = make_image();
 
         SkRect dstR = { 0, 200, 128, 380 };
 
@@ -74,12 +75,12 @@
             SkRect srcR;
             srcR.set(src[i]);
 
-            canvas->drawBitmap(bitmap, 0, 0, &paint);
+            canvas->drawImage(image, 0, 0, &paint);
             if (!fUseIRect) {
-                canvas->drawBitmapRect(bitmap, srcR, dstR, &paint,
-                                       SkCanvas::kStrict_SrcRectConstraint);
+                canvas->drawImageRect(image, srcR, dstR, &paint,
+                                      SkCanvas::kStrict_SrcRectConstraint);
             } else {
-                canvas->drawBitmapRect(bitmap, src[i], dstR, &paint);
+                canvas->drawImageRect(image, src[i], dstR, &paint);
             }
 
             canvas->drawRect(dstR, paint);