Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/tiles/software_image_decode_controller_unittest.cc

Issue 1869753003: Replace many skia::RefPtr with sk_sp<> in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/tiles/software_image_decode_controller.cc ('K') | « cc/tiles/software_image_decode_controller.cc ('k') | cc/tiles/tile_manager_unittest.cc » ('j') | cc/trees/layer_tree_host_pixeltest_blending.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/software_image_decode_controller_unittest.cc
diff --git a/cc/tiles/software_image_decode_controller_unittest.cc b/cc/tiles/software_image_decode_controller_unittest.cc
index 38246b38398a20307d639ee76bde98d8a204badd..6bee5ca57fe260f99544c9ee43d92ab3238d887e 100644
--- a/cc/tiles/software_image_decode_controller_unittest.cc
+++ b/cc/tiles/software_image_decode_controller_unittest.cc
@@ -10,11 +10,11 @@
namespace cc {
namespace {
-skia::RefPtr<SkImage> CreateImage(int width, int height) {
+sk_sp<SkImage> CreateImage(int width, int height) {
SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
SkBitmap bitmap;
bitmap.allocPixels(info);
- return skia::AdoptRef(SkImage::NewFromBitmap(bitmap));
+ return SkImage::MakeFromBitmap(bitmap);
}
SkMatrix CreateMatrix(const SkSize& scale, bool is_decomposable) {
@@ -30,7 +30,7 @@ SkMatrix CreateMatrix(const SkSize& scale, bool is_decomposable) {
}
TEST(SoftwareImageDecodeControllerTest, ImageKeyLowQuality) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality qualities[] = {kNone_SkFilterQuality, kLow_SkFilterQuality};
for (auto quality : qualities) {
@@ -51,7 +51,7 @@ TEST(SoftwareImageDecodeControllerTest, ImageKeyLowQuality) {
}
TEST(SoftwareImageDecodeControllerTest, ImageKeyMediumQuality) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kMedium_SkFilterQuality;
@@ -70,7 +70,7 @@ TEST(SoftwareImageDecodeControllerTest, ImageKeyMediumQuality) {
TEST(SoftwareImageDecodeControllerTest,
ImageKeyMediumQualityDropToLowIfEnlarging) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kMedium_SkFilterQuality;
@@ -89,7 +89,7 @@ TEST(SoftwareImageDecodeControllerTest,
TEST(SoftwareImageDecodeControllerTest,
ImageKeyMediumQualityDropToLowIfIdentity) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kMedium_SkFilterQuality;
@@ -108,7 +108,7 @@ TEST(SoftwareImageDecodeControllerTest,
TEST(SoftwareImageDecodeControllerTest,
ImageKeyMediumQualityDropToLowIfNearlyIdentity) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kMedium_SkFilterQuality;
@@ -127,7 +127,7 @@ TEST(SoftwareImageDecodeControllerTest,
TEST(SoftwareImageDecodeControllerTest,
ImageKeyMediumQualityDropToLowIfNearlyIdentity2) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kMedium_SkFilterQuality;
@@ -146,7 +146,7 @@ TEST(SoftwareImageDecodeControllerTest,
TEST(SoftwareImageDecodeControllerTest,
ImageKeyMediumQualityDropToLowIfNotDecomposable) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = false;
SkFilterQuality quality = kMedium_SkFilterQuality;
@@ -164,7 +164,7 @@ TEST(SoftwareImageDecodeControllerTest,
}
TEST(SoftwareImageDecodeControllerTest, ImageKeyHighQuality) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kHigh_SkFilterQuality;
@@ -184,7 +184,7 @@ TEST(SoftwareImageDecodeControllerTest, ImageKeyHighQuality) {
TEST(SoftwareImageDecodeControllerTest,
ImageKeyHighQualityDropToMediumIfTooLarge) {
// Just over 64MB when scaled.
- skia::RefPtr<SkImage> image = CreateImage(4555, 2048);
+ sk_sp<SkImage> image = CreateImage(4555, 2048);
bool is_decomposable = true;
SkFilterQuality quality = kHigh_SkFilterQuality;
@@ -205,7 +205,7 @@ TEST(SoftwareImageDecodeControllerTest,
TEST(SoftwareImageDecodeControllerTest,
ImageKeyHighQualityDropToLowIfNotDecomposable) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = false;
SkFilterQuality quality = kHigh_SkFilterQuality;
@@ -224,7 +224,7 @@ TEST(SoftwareImageDecodeControllerTest,
TEST(SoftwareImageDecodeControllerTest,
ImageKeyHighQualityDropToLowIfIdentity) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kHigh_SkFilterQuality;
@@ -243,7 +243,7 @@ TEST(SoftwareImageDecodeControllerTest,
TEST(SoftwareImageDecodeControllerTest,
ImageKeyHighQualityDropToLowIfNearlyIdentity) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kHigh_SkFilterQuality;
@@ -262,7 +262,7 @@ TEST(SoftwareImageDecodeControllerTest,
TEST(SoftwareImageDecodeControllerTest,
ImageKeyHighQualityDropToLowIfNearlyIdentity2) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kHigh_SkFilterQuality;
@@ -280,7 +280,7 @@ TEST(SoftwareImageDecodeControllerTest,
}
TEST(SoftwareImageDecodeControllerTest, OriginalDecodesAreEqual) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kLow_SkFilterQuality;
@@ -313,7 +313,7 @@ TEST(SoftwareImageDecodeControllerTest, OriginalDecodesAreEqual) {
}
TEST(SoftwareImageDecodeControllerTest, ImageRectDoesNotContainSrcRect) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kHigh_SkFilterQuality;
@@ -332,7 +332,7 @@ TEST(SoftwareImageDecodeControllerTest, ImageRectDoesNotContainSrcRect) {
TEST(SoftwareImageDecodeControllerTest,
ImageRectDoesNotContainSrcRectWithScale) {
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kHigh_SkFilterQuality;
@@ -351,7 +351,7 @@ TEST(SoftwareImageDecodeControllerTest,
TEST(SoftwareImageDecodeControllerTest, GetTaskForImageSameImage) {
SoftwareImageDecodeController controller;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
SkFilterQuality quality = kHigh_SkFilterQuality;
uint64_t prepare_tiles_id = 1;
@@ -381,7 +381,7 @@ TEST(SoftwareImageDecodeControllerTest, GetTaskForImageSameImage) {
TEST(SoftwareImageDecodeControllerTest,
GetTaskForImageSameImageDifferentQuality) {
SoftwareImageDecodeController controller;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
uint64_t prepare_tiles_id = 1;
@@ -427,7 +427,7 @@ TEST(SoftwareImageDecodeControllerTest,
TEST(SoftwareImageDecodeControllerTest, GetTaskForImageSameImageDifferentSize) {
SoftwareImageDecodeController controller;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
bool is_decomposable = true;
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
@@ -461,7 +461,7 @@ TEST(SoftwareImageDecodeControllerTest, GetTaskForImageDifferentImage) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> first_image = CreateImage(100, 100);
+ sk_sp<SkImage> first_image = CreateImage(100, 100);
DrawImage first_draw_image(
first_image.get(),
SkIRect::MakeWH(first_image->width(), first_image->height()), quality,
@@ -472,7 +472,7 @@ TEST(SoftwareImageDecodeControllerTest, GetTaskForImageDifferentImage) {
EXPECT_TRUE(need_unref);
EXPECT_TRUE(first_task);
- skia::RefPtr<SkImage> second_image = CreateImage(100, 100);
+ sk_sp<SkImage> second_image = CreateImage(100, 100);
DrawImage second_draw_image(
second_image.get(),
SkIRect::MakeWH(second_image->width(), second_image->height()), quality,
@@ -494,7 +494,7 @@ TEST(SoftwareImageDecodeControllerTest, GetTaskForImageAlreadyDecoded) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -529,7 +529,7 @@ TEST(SoftwareImageDecodeControllerTest, GetTaskForImageAlreadyPrerolled) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kLow_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
@@ -571,7 +571,7 @@ TEST(SoftwareImageDecodeControllerTest, GetTaskForImageCanceledGetsNewTask) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -618,7 +618,7 @@ TEST(SoftwareImageDecodeControllerTest,
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -664,7 +664,7 @@ TEST(SoftwareImageDecodeControllerTest, GetDecodedImageForDraw) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -706,7 +706,7 @@ TEST(SoftwareImageDecodeControllerTest,
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeXYWH(20, 30, image->width(), image->height()),
quality, CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -746,7 +746,7 @@ TEST(SoftwareImageDecodeControllerTest, GetDecodedImageForDrawAtRasterDecode) {
bool is_decomposable = true;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -771,7 +771,7 @@ TEST(SoftwareImageDecodeControllerTest,
bool is_decomposable = true;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -803,7 +803,7 @@ TEST(SoftwareImageDecodeControllerTest,
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -857,7 +857,7 @@ TEST(SoftwareImageDecodeControllerTest,
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -911,7 +911,7 @@ TEST(SoftwareImageDecodeControllerTest, ZeroSizedImagesAreSkipped) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(0.f, 0.f), is_decomposable));
@@ -935,7 +935,7 @@ TEST(SoftwareImageDecodeControllerTest, NonOverlappingSrcRectImagesAreSkipped) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeXYWH(150, 150, image->width(), image->height()),
quality, CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
@@ -959,7 +959,7 @@ TEST(SoftwareImageDecodeControllerTest, LowQualityFilterIsHandled) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kLow_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
@@ -987,7 +987,7 @@ TEST(SoftwareImageDecodeControllerTest, LowQualityScaledSubrectIsHandled) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kLow_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(image.get(), SkIRect::MakeXYWH(10, 10, 80, 80), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -1016,7 +1016,7 @@ TEST(SoftwareImageDecodeControllerTest, NoneQualityScaledSubrectIsHandled) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kNone_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(100, 100);
+ sk_sp<SkImage> image = CreateImage(100, 100);
DrawImage draw_image(image.get(), SkIRect::MakeXYWH(10, 10, 80, 80), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
« cc/tiles/software_image_decode_controller.cc ('K') | « cc/tiles/software_image_decode_controller.cc ('k') | cc/tiles/tile_manager_unittest.cc » ('j') | cc/trees/layer_tree_host_pixeltest_blending.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698