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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/tiles/gpu_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/gpu_image_decode_controller.cc ('K') | « cc/tiles/gpu_image_decode_controller.cc ('k') | cc/tiles/software_image_decode_controller.h » ('j') | cc/tiles/software_image_decode_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/gpu_image_decode_controller_unittest.cc
diff --git a/cc/tiles/gpu_image_decode_controller_unittest.cc b/cc/tiles/gpu_image_decode_controller_unittest.cc
index fef46e98dccf01c3c3c03c16df8f79be96ed8e9f..386aec1b994050452139633d5cc2bf76b95cb458 100644
--- a/cc/tiles/gpu_image_decode_controller_unittest.cc
+++ b/cc/tiles/gpu_image_decode_controller_unittest.cc
@@ -12,11 +12,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) {
@@ -60,7 +60,7 @@ TEST(GpuImageDecodeControllerTest, GetTaskForImageSameImage) {
context_provider->BindToCurrentThread();
GpuImageDecodeController controller(context_provider.get(),
ResourceFormat::RGBA_8888);
- 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;
@@ -99,7 +99,7 @@ TEST(GpuImageDecodeControllerTest, 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,
@@ -110,7 +110,7 @@ TEST(GpuImageDecodeControllerTest, 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,
@@ -140,7 +140,7 @@ TEST(GpuImageDecodeControllerTest, 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));
@@ -176,7 +176,7 @@ TEST(GpuImageDecodeControllerTest, 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));
@@ -226,7 +226,7 @@ TEST(GpuImageDecodeControllerTest,
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));
@@ -275,7 +275,7 @@ TEST(GpuImageDecodeControllerTest, 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));
@@ -310,7 +310,7 @@ TEST(GpuImageDecodeControllerTest, GetLargeDecodedImageForDraw) {
uint64_t prepare_tiles_id = 1;
SkFilterQuality quality = kHigh_SkFilterQuality;
- skia::RefPtr<SkImage> image = CreateImage(1, 24000);
+ sk_sp<SkImage> image = CreateImage(1, 24000);
DrawImage draw_image(
image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
@@ -348,7 +348,7 @@ TEST(GpuImageDecodeControllerTest, GetDecodedImageForDrawAtRasterDecode) {
controller.SetCachedItemLimitForTesting(0);
controller.SetCachedBytesLimitForTesting(0);
- 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));
@@ -383,7 +383,7 @@ TEST(GpuImageDecodeControllerTest, AtRasterUsedDirectlyIfSpaceAllows) {
controller.SetCachedItemLimitForTesting(0);
controller.SetCachedBytesLimitForTesting(0);
- 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));
@@ -430,7 +430,7 @@ TEST(GpuImageDecodeControllerTest,
controller.SetCachedItemLimitForTesting(0);
controller.SetCachedBytesLimitForTesting(0);
- 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));
@@ -462,7 +462,7 @@ TEST(GpuImageDecodeControllerTest, 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));
@@ -492,7 +492,7 @@ TEST(GpuImageDecodeControllerTest, 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));
@@ -522,7 +522,7 @@ TEST(GpuImageDecodeControllerTest, CanceledTasksDoNotCountAgainstBudget) {
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(0, 0, image->width(), image->height()),
quality, CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
@@ -552,7 +552,7 @@ TEST(GpuImageDecodeControllerTest, ShouldAggressivelyFreeResources) {
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));
« cc/tiles/gpu_image_decode_controller.cc ('K') | « cc/tiles/gpu_image_decode_controller.cc ('k') | cc/tiles/software_image_decode_controller.h » ('j') | cc/tiles/software_image_decode_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698