Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Update some more uses of the deprecated Skia SkImage::MakeFromBitmap API #41041

Merged
jason-simmons merged 1 commit into from
Apr 10, 2023
Merged

Update some more uses of the deprecated Skia SkImage::MakeFromBitmap API #41041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions shell/common/dl_op_spy_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ TEST(DlOpSpy, Images) {
SkAlphaType::kPremul_SkAlphaType);
SkBitmap bitmap;
bitmap.allocPixels(info, 0);
auto sk_image = SkImage::MakeFromBitmap(bitmap);
auto sk_image = SkImages::RasterFromBitmap(bitmap);
builder.DrawImage(DlImage::Make(sk_image), SkPoint::Make(5, 5),
DlImageSampling::kLinear);
sk_sp<DisplayList> dl = builder.Build();
Expand All @@ -353,7 +353,7 @@ TEST(DlOpSpy, Images) {
SkAlphaType::kPremul_SkAlphaType);
SkBitmap bitmap;
bitmap.allocPixels(info, 0);
auto sk_image = SkImage::MakeFromBitmap(bitmap);
auto sk_image = SkImages::RasterFromBitmap(bitmap);
builder.DrawImageRect(DlImage::Make(sk_image), SkRect::MakeWH(5, 5),
SkRect::MakeWH(5, 5), DlImageSampling::kLinear);
sk_sp<DisplayList> dl = builder.Build();
Expand All @@ -369,7 +369,7 @@ TEST(DlOpSpy, Images) {
SkAlphaType::kPremul_SkAlphaType);
SkBitmap bitmap;
bitmap.allocPixels(info, 0);
auto sk_image = SkImage::MakeFromBitmap(bitmap);
auto sk_image = SkImages::RasterFromBitmap(bitmap);
builder.DrawImageNine(DlImage::Make(sk_image), SkIRect::MakeWH(5, 5),
SkRect::MakeWH(5, 5), DlFilterMode::kLinear);
sk_sp<DisplayList> dl = builder.Build();
Expand All @@ -385,7 +385,7 @@ TEST(DlOpSpy, Images) {
SkAlphaType::kPremul_SkAlphaType);
SkBitmap bitmap;
bitmap.allocPixels(info, 0);
auto sk_image = SkImage::MakeFromBitmap(bitmap);
auto sk_image = SkImages::RasterFromBitmap(bitmap);
const SkRSXform xform[] = {};
const SkRect tex[] = {};
const DlColor colors[] = {};
Expand Down