Use bitmap.asImage()
Change-Id: Ie16194937530d7cd75f84d9af66c31b77875ef83
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347043
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/tests/DeviceTest.cpp b/tests/DeviceTest.cpp
index 60b7ff3..0557ff6 100644
--- a/tests/DeviceTest.cpp
+++ b/tests/DeviceTest.cpp
@@ -101,7 +101,7 @@
SkASSERT(SkIRect::MakeWH(kWidth, kHeight) == special->subset());
// Create a gpu-backed special image from a raster-backed SkImage
- sk_sp<SkImage> image(SkImage::MakeFromBitmap(bm));
+ sk_sp<SkImage> image(bm.asImage());
special = DeviceTestingAccess::MakeSpecial(gpuDev.get(), image.get());
SkASSERT(special->isTextureBacked());
SkASSERT(kWidth == special->width());
diff --git a/tests/FlattenableFactoryToName.cpp b/tests/FlattenableFactoryToName.cpp
index 07f2263..45b0fbd 100644
--- a/tests/FlattenableFactoryToName.cpp
+++ b/tests/FlattenableFactoryToName.cpp
@@ -37,6 +37,6 @@
SkBitmap bm;
bm.allocN32Pixels(8, 8);
bm.eraseColor(SK_ColorCYAN);
- sk_sp<SkImage> image(SkImage::MakeFromBitmap(bm));
+ sk_sp<SkImage> image(bm.asImage());
test_flattenable(r, image->makeShader(SkSamplingOptions()).get(), "SkImage::newShader()");
}
diff --git a/tests/GrDDLImageTest.cpp b/tests/GrDDLImageTest.cpp
index effcb96..b26ee5b 100644
--- a/tests/GrDDLImageTest.cpp
+++ b/tests/GrDDLImageTest.cpp
@@ -28,7 +28,7 @@
bm.allocPixels();
bm.eraseColor(SK_ColorBLACK);
bm.setImmutable();
- auto rasterImg = SkImage::MakeFromBitmap(bm);
+ auto rasterImg = bm.asImage();
REPORTER_ASSERT(reporter, rasterImg->isValid(static_cast<GrRecordingContext*>(nullptr)));
// raster + context:
diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp
index 939517b..7c1b033 100644
--- a/tests/GrMipMappedTest.cpp
+++ b/tests/GrMipMappedTest.cpp
@@ -329,7 +329,7 @@
SkPMColor* pixel = reinterpret_cast<SkPMColor*>(bmp.getPixels());
*pixel = 0;
- sk_sp<SkImage> bmpImage = SkImage::MakeFromBitmap(bmp);
+ sk_sp<SkImage> bmpImage = bmp.asImage();
// Make sure we scale so we don't optimize out the use of mips.
surface->getCanvas()->scale(0.5f, 0.5f);
diff --git a/tests/ImageBitmapTest.cpp b/tests/ImageBitmapTest.cpp
index 38053e3..4295bed 100644
--- a/tests/ImageBitmapTest.cpp
+++ b/tests/ImageBitmapTest.cpp
@@ -22,9 +22,9 @@
(void)bm.extractSubset(&a, SkIRect::MakeXYWH(0, 0, 32, 32));
(void)bm.extractSubset(&b, SkIRect::MakeXYWH(0, 32, 32, 32));
REPORTER_ASSERT(r, a.getGenerationID() == b.getGenerationID());
- auto img = SkImage::MakeFromBitmap(bm);
- auto imgA = SkImage::MakeFromBitmap(a);
- auto imgB = SkImage::MakeFromBitmap(b);
+ auto img = bm.asImage();
+ auto imgA = a.asImage();
+ auto imgB = b.asImage();
REPORTER_ASSERT(r, img->uniqueID() == bm.getGenerationID());
REPORTER_ASSERT(r, img->uniqueID() != imgA->uniqueID());
REPORTER_ASSERT(r, img->uniqueID() != imgB->uniqueID());
diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp
index 6f7cb64..92e7771 100644
--- a/tests/ImageFilterCacheTest.cpp
+++ b/tests/ImageFilterCacheTest.cpp
@@ -193,7 +193,7 @@
DEF_TEST(ImageFilterCache_ImageBackedRaster, reporter) {
SkBitmap srcBM = create_bm();
- sk_sp<SkImage> srcImage(SkImage::MakeFromBitmap(srcBM));
+ sk_sp<SkImage> srcImage(srcBM.asImage());
test_image_backed(reporter, nullptr, srcImage);
}
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index c40fb09..812bcca 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -124,7 +124,7 @@
SkImageFilters::ColorFilter(std::move(cf), input, cropRect));
}
{
- sk_sp<SkImage> gradientImage(SkImage::MakeFromBitmap(make_gradient_circle(64, 64)));
+ sk_sp<SkImage> gradientImage(make_gradient_circle(64, 64).asImage());
sk_sp<SkImageFilter> gradientSource(SkImageFilters::Image(std::move(gradientImage)));
this->addFilter("displacement map",
@@ -515,7 +515,7 @@
sk_sp<SkImageFilter> positiveFilter(SkImageFilters::Blur(kBlurSigma, kBlurSigma, nullptr));
sk_sp<SkImageFilter> negativeFilter(SkImageFilters::Blur(-kBlurSigma, kBlurSigma, nullptr));
- sk_sp<SkImage> gradient = SkImage::MakeFromBitmap(make_gradient_circle(kWidth, kHeight));
+ sk_sp<SkImage> gradient = make_gradient_circle(kWidth, kHeight).asImage();
sk_sp<SkSpecialImage> imgSrc(
SkSpecialImage::MakeFromImage(dContext, SkIRect::MakeWH(kWidth, kHeight), gradient));
@@ -607,7 +607,7 @@
paint.setColor(SK_ColorWHITE);
canvas.drawRect(SkRect::MakeXYWH(kWidth / 4, kHeight / 4, kWidth / 2, kHeight / 2),
paint);
- sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap);
+ sk_sp<SkImage> image = bitmap.asImage();
sk_sp<SkSpecialImage> imgSrc(
SkSpecialImage::MakeFromImage(dContext, SkIRect::MakeWH(kWidth, kHeight), image));
@@ -1002,7 +1002,7 @@
SkBitmap greenBM;
greenBM.allocN32Pixels(20, 20);
greenBM.eraseColor(SK_ColorGREEN);
- sk_sp<SkImage> greenImage(SkImage::MakeFromBitmap(greenBM));
+ sk_sp<SkImage> greenImage(greenBM.asImage());
sk_sp<SkImageFilter> source(SkImageFilters::Image(std::move(greenImage)));
sk_sp<SkImageFilter> merge(SkImageFilters::Merge(source, source));
@@ -1637,7 +1637,7 @@
return;
}
- sk_sp<SkImage> largeImage(SkImage::MakeFromBitmap(largeBmp));
+ sk_sp<SkImage> largeImage(largeBmp.asImage());
if (!largeImage) {
ERRORF(reporter, "Failed to create large image.");
return;
@@ -1954,7 +1954,7 @@
// Test SkImageSource::filterBounds.
DEF_TEST(ImageSourceBounds, reporter) {
- sk_sp<SkImage> image(SkImage::MakeFromBitmap(make_gradient_circle(64, 64)));
+ sk_sp<SkImage> image(make_gradient_circle(64, 64).asImage());
// Default src and dst rects.
sk_sp<SkImageFilter> source1(SkImageFilters::Image(image));
SkIRect imageBounds = SkIRect::MakeWH(64, 64);
diff --git a/tests/ImageFrom565Bitmap.cpp b/tests/ImageFrom565Bitmap.cpp
index 037010e..3349aa8 100644
--- a/tests/ImageFrom565Bitmap.cpp
+++ b/tests/ImageFrom565Bitmap.cpp
@@ -15,5 +15,5 @@
bm.allocPixels(SkImageInfo::Make(
5, 7, kRGB_565_SkColorType, kOpaque_SkAlphaType));
bm.eraseColor(SK_ColorBLACK);
- REPORTER_ASSERT(r, SkImage::MakeFromBitmap(bm) != nullptr);
+ REPORTER_ASSERT(r, bm.asImage() != nullptr);
}
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 57ce3fe..7bdf8dd6 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -314,7 +314,7 @@
SkBitmap bm;
rec[i].fMakeProc(&bm);
- sk_sp<SkImage> image(SkImage::MakeFromBitmap(bm));
+ sk_sp<SkImage> image(bm.asImage());
SkPixmap pmap;
const bool sharedID = (image->uniqueID() == bm.getGenerationID());
@@ -511,7 +511,7 @@
}
}
auto dContext = ctxInfo.directContext();
- auto texImage = SkImage::MakeFromBitmap(bmp)->makeTextureImage(dContext);
+ auto texImage = bmp.asImage()->makeTextureImage(dContext);
if (!texImage || texImage->alphaType() != kUnpremul_SkAlphaType) {
ERRORF(reporter, "Failed to make unpremul texture image.");
return;
@@ -746,7 +746,7 @@
SkBitmap tmp;
REPORTER_ASSERT(reporter, bitmap.extractSubset(&tmp, SkIRect::MakeWH(image->width() / 2,
image->height() / 2)));
- sk_sp<SkImage> subsetImage(SkImage::MakeFromBitmap(tmp));
+ sk_sp<SkImage> subsetImage(tmp.asImage());
REPORTER_ASSERT(reporter, subsetImage.get());
SkBitmap subsetBitmap;
@@ -1169,7 +1169,7 @@
SkBitmap bitmap;
SkImageInfo info = SkImageInfo::MakeN32(10, 10, kPremul_SkAlphaType, rec2020);
bitmap.allocPixels(info);
- image = SkImage::MakeFromBitmap(bitmap);
+ image = bitmap.asImage();
REPORTER_ASSERT(r, SkColorSpace::Equals(rec2020.get(), image->colorSpace()));
sk_sp<SkSurface> surface = SkSurface::MakeRaster(
@@ -1192,7 +1192,7 @@
srgbBitmap.allocPixels(SkImageInfo::MakeS32(1, 1, kOpaque_SkAlphaType));
*srgbBitmap.getAddr32(0, 0) = SkSwizzle_RGBA_to_PMColor(0xFF604020);
srgbBitmap.setImmutable();
- sk_sp<SkImage> srgbImage = SkImage::MakeFromBitmap(srgbBitmap);
+ sk_sp<SkImage> srgbImage = srgbBitmap.asImage();
sk_sp<SkImage> p3Image = srgbImage->makeColorSpace(p3, nullptr);
SkBitmap p3Bitmap;
bool success = p3Image->asLegacyBitmap(&p3Bitmap);
@@ -1253,7 +1253,7 @@
SkBitmap bm0;
make_all_premul(&bm0);
- auto img0 = SkImage::MakeFromBitmap(bm0);
+ auto img0 = bm0.asImage();
sk_sp<SkData> data = img0->encodeToData(SkEncodedImageFormat::kPNG, 100);
auto img1 = SkImage::MakeFromEncoded(data);
diff --git a/tests/RepeatedClippedBlurTest.cpp b/tests/RepeatedClippedBlurTest.cpp
index fde8bbd..81bfc33 100644
--- a/tests/RepeatedClippedBlurTest.cpp
+++ b/tests/RepeatedClippedBlurTest.cpp
@@ -53,7 +53,7 @@
bm.eraseColor(SK_ColorRED);
bm.eraseArea(SkIRect::MakeXYWH(1, 2, 1277, 1274), SK_ColorGREEN);
- sk_sp<SkImage> rasterImg = SkImage::MakeFromBitmap(bm);
+ sk_sp<SkImage> rasterImg = bm.asImage();
bigImg = rasterImg->makeTextureImage(dContext);
}
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index 5a58f6d..e13d3eb 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -271,9 +271,9 @@
const SkBitmap& invalidBitmap,
bool shouldSucceed,
skiatest::Reporter* reporter) {
- sk_sp<SkImage> validImage(SkImage::MakeFromBitmap(validBitmap));
+ sk_sp<SkImage> validImage(validBitmap.asImage());
sk_sp<SkImageFilter> validBitmapSource(SkImageFilters::Image(std::move(validImage)));
- sk_sp<SkImage> invalidImage(SkImage::MakeFromBitmap(invalidBitmap));
+ sk_sp<SkImage> invalidImage(invalidBitmap.asImage());
sk_sp<SkImageFilter> invalidBitmapSource(SkImageFilters::Image(std::move(invalidImage)));
sk_sp<SkImageFilter> xfermodeImageFilter(
SkImageFilters::Blend(SkBlendMode::kSrcOver,
diff --git a/tests/ShaderTest.cpp b/tests/ShaderTest.cpp
index 09111de..8189b48 100644
--- a/tests/ShaderTest.cpp
+++ b/tests/ShaderTest.cpp
@@ -40,13 +40,13 @@
const int H = 100;
SkBitmap bm;
bm.allocN32Pixels(W, H);
- auto img = SkImage::MakeFromBitmap(bm);
+ auto img = bm.asImage();
const SkMatrix localM = SkMatrix::Scale(2, 3);
const SkTileMode tmx = SkTileMode::kRepeat;
const SkTileMode tmy = SkTileMode::kMirror;
auto shader0 = bm.makeShader(tmx, tmy, SkSamplingOptions(), localM);
- auto shader1 = SkImage::MakeFromBitmap(bm)->makeShader(tmx, tmy, SkSamplingOptions(), localM);
+ auto shader1 = bm.asImage()->makeShader(tmx, tmy, SkSamplingOptions(), localM);
check_isaimage(reporter, shader0.get(), W, H, tmx, tmy, localM);
check_isaimage(reporter, shader1.get(), W, H, tmx, tmy, localM);
diff --git a/tests/SkImageTest.cpp b/tests/SkImageTest.cpp
index 63ebef5..bbbcdfd 100644
--- a/tests/SkImageTest.cpp
+++ b/tests/SkImageTest.cpp
@@ -27,7 +27,7 @@
canvas.drawIRect(r, p);
SkBitmap dstBitmap;
srcBitmap.extractSubset(&dstBitmap, r);
- image = SkImage::MakeFromBitmap(dstBitmap);
+ image = dstBitmap.asImage();
}
SkBitmap tgt;
diff --git a/tests/SkResourceCacheTest.cpp b/tests/SkResourceCacheTest.cpp
index 89339cd..175abe1 100644
--- a/tests/SkResourceCacheTest.cpp
+++ b/tests/SkResourceCacheTest.cpp
@@ -43,7 +43,7 @@
SkBitmap src;
src.allocN32Pixels(5, 5);
src.setImmutable();
- sk_sp<SkImage> img = SkImage::MakeFromBitmap(src);
+ sk_sp<SkImage> img = src.asImage();
const auto desc = SkBitmapCacheDesc::Make(img.get());
const SkMipmap* mipmap = SkMipmapCache::FindAndRef(desc, cache);
@@ -85,7 +85,7 @@
for (int i = 0; i < N; ++i) {
src[i].allocN32Pixels(5, 5);
src[i].setImmutable();
- img[i] = SkImage::MakeFromBitmap(src[i]);
+ img[i] = src[i].asImage();
SkMipmapCache::AddAndRef(as_IB(img[i].get()), cache)->unref();
desc[i] = SkBitmapCacheDesc::Make(img[i].get());
}
diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index 0bc1518..2e08a39 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -159,7 +159,7 @@
static void test_specialimage_image(skiatest::Reporter* reporter) {
SkBitmap bm = create_bm();
- sk_sp<SkImage> fullImage(SkImage::MakeFromBitmap(bm));
+ sk_sp<SkImage> fullImage(bm.asImage());
sk_sp<SkSpecialImage> fullSImage(SkSpecialImage::MakeFromImage(
nullptr,
diff --git a/tests/TextureProxyTest.cpp b/tests/TextureProxyTest.cpp
index 1cece0a..affb584 100644
--- a/tests/TextureProxyTest.cpp
+++ b/tests/TextureProxyTest.cpp
@@ -229,7 +229,7 @@
SkBitmap bm;
bm.allocPixels(ii);
- rasterImg = SkImage::MakeFromBitmap(bm);
+ rasterImg = bm.asImage();
REPORTER_ASSERT(reporter, 0 == proxyProvider->numUniqueKeyProxies_TestOnly());
REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
}