commit ac9f0c9e2702e5139dc788b33eff35f67fa46b75
author Mike Reed <reed@google.com> Wed Dec 23 10:11:33 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 23 15:54:57 2020 +0000
tree 969de4f2bf5ab005286b594c6775321fd724ce33
parent cd228e25c7ec92b20e3c33532d6459feddd3b4d1

Bitmap.asImage()

... and lots and lots of IWYU

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

gm/composeshader.cpp

diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp
index 909b4d2..1303333 100644
--- a/gm/composeshader.cpp
+++ b/gm/composeshader.cpp
@@ -272,8 +272,8 @@
     imageInfo = SkImageInfo::Make(width, height,
             SkColorType::kAlpha_8_SkColorType, kPremul_SkAlphaType);
     skMask.installPixels(imageInfo, dst8Storage.begin(), width, nullptr, nullptr);
-    sk_sp<SkImage> skSrc = SkImage::MakeFromBitmap(skBitmap);
-    sk_sp<SkImage> skMaskImage = SkImage::MakeFromBitmap(skMask);
+    sk_sp<SkImage> skSrc = skBitmap.asImage();
+    sk_sp<SkImage> skMaskImage = skMask.asImage();
     paint.setShader(
         SkShaders::Blend(SkBlendMode::kSrcIn,
                          skMaskImage->makeShader(SkSamplingOptions()),