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

Unified Diff: cc/playback/recording_source_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: fmalita review - deconstify sk_sp<>s 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
Index: cc/playback/recording_source_unittest.cc
diff --git a/cc/playback/recording_source_unittest.cc b/cc/playback/recording_source_unittest.cc
index c214cf6602a1ee7606e9920e0e34ea5e75760438..9547cccc2516cf4c267b3d66aea50e0dfeb2e340 100644
--- a/cc/playback/recording_source_unittest.cc
+++ b/cc/playback/recording_source_unittest.cc
@@ -101,7 +101,7 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
std::unique_ptr<FakeRecordingSource> recording_source =
FakeRecordingSource::CreateFilledRecordingSource(
recorded_viewport.size());
- skia::RefPtr<SkImage> discardable_image[2][2];
+ sk_sp<SkImage> discardable_image[2][2];
gfx::Transform identity_transform;
discardable_image[0][0] = CreateDiscardableImage(gfx::Size(32, 32));
// Translate transform is equivalent to moving using point.
@@ -252,8 +252,8 @@ TEST(RecordingSourceTest, NoDiscardableImages) {
SkBitmap non_discardable_bitmap;
non_discardable_bitmap.allocN32Pixels(128, 128);
non_discardable_bitmap.setImmutable();
- skia::RefPtr<SkImage> non_discardable_image =
- skia::AdoptRef(SkImage::NewFromBitmap(non_discardable_bitmap));
+ sk_sp<SkImage> non_discardable_image =
+ SkImage::MakeFromBitmap(non_discardable_bitmap);
recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 256, 256),
simple_paint);
@@ -304,7 +304,7 @@ TEST(RecordingSourceTest, DiscardableImages) {
std::unique_ptr<FakeRecordingSource> recording_source =
CreateRecordingSource(recorded_viewport);
- skia::RefPtr<SkImage> discardable_image[2][2];
+ sk_sp<SkImage> discardable_image[2][2];
discardable_image[0][0] = CreateDiscardableImage(gfx::Size(32, 32));
discardable_image[1][0] = CreateDiscardableImage(gfx::Size(32, 32));
discardable_image[1][1] = CreateDiscardableImage(gfx::Size(32, 32));
@@ -374,10 +374,10 @@ TEST(RecordingSourceTest, DiscardableImagesBaseNonDiscardable) {
SkBitmap non_discardable_bitmap;
non_discardable_bitmap.allocN32Pixels(512, 512);
non_discardable_bitmap.setImmutable();
- skia::RefPtr<SkImage> non_discardable_image =
- skia::AdoptRef(SkImage::NewFromBitmap(non_discardable_bitmap));
+ sk_sp<SkImage> non_discardable_image =
+ SkImage::MakeFromBitmap(non_discardable_bitmap);
- skia::RefPtr<SkImage> discardable_image[2][2];
+ sk_sp<SkImage> discardable_image[2][2];
discardable_image[0][0] = CreateDiscardableImage(gfx::Size(128, 128));
discardable_image[0][1] = CreateDiscardableImage(gfx::Size(128, 128));
discardable_image[1][1] = CreateDiscardableImage(gfx::Size(128, 128));

Powered by Google App Engine
This is Rietveld 408576698