| Index: cc/playback/discardable_image_map_unittest.cc
|
| diff --git a/cc/playback/discardable_image_map_unittest.cc b/cc/playback/discardable_image_map_unittest.cc
|
| index c02de7dc17d076dbf411517a6a8ccdcec158798b..54d497ecb47f18decff2de2a7ab278a98b075f7c 100644
|
| --- a/cc/playback/discardable_image_map_unittest.cc
|
| +++ b/cc/playback/discardable_image_map_unittest.cc
|
| @@ -72,7 +72,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectTest) {
|
| // |---|---|---|---|
|
| // | x | | x | |
|
| // |---|---|---|---|
|
| - skia::RefPtr<SkImage> discardable_image[4][4];
|
| + sk_sp<SkImage> discardable_image[4][4];
|
| for (int y = 0; y < 4; ++y) {
|
| for (int x = 0; x < 4; ++x) {
|
| if ((x + y) & 1) {
|
| @@ -149,7 +149,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectNonZeroLayer) {
|
| // |---|---|---|---|
|
| // | x | | x | |
|
| // |---|---|---|---|
|
| - skia::RefPtr<SkImage> discardable_image[4][4];
|
| + sk_sp<SkImage> discardable_image[4][4];
|
| for (int y = 0; y < 4; ++y) {
|
| for (int x = 0; x < 4; ++x) {
|
| if ((x + y) & 1) {
|
| @@ -249,7 +249,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectOnePixelQuery) {
|
| // |---|---|---|---|
|
| // | x | | x | |
|
| // |---|---|---|---|
|
| - skia::RefPtr<SkImage> discardable_image[4][4];
|
| + sk_sp<SkImage> discardable_image[4][4];
|
| for (int y = 0; y < 4; ++y) {
|
| for (int x = 0; x < 4; ++x) {
|
| if ((x + y) & 1) {
|
| @@ -299,7 +299,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMassiveImage) {
|
| FakeContentLayerClient content_layer_client;
|
| content_layer_client.set_bounds(visible_rect.size());
|
|
|
| - skia::RefPtr<SkImage> discardable_image;
|
| + sk_sp<SkImage> discardable_image;
|
| discardable_image = CreateDiscardableImage(gfx::Size(1 << 25, 1 << 25));
|
| SkPaint paint;
|
| content_layer_client.add_draw_image(discardable_image.get(), gfx::Point(0, 0),
|
| @@ -331,7 +331,7 @@ TEST_F(DiscardableImageMapTest, PaintDestroyedWhileImageIsDrawn) {
|
| FakeContentLayerClient content_layer_client;
|
| content_layer_client.set_bounds(visible_rect.size());
|
|
|
| - skia::RefPtr<SkImage> discardable_image;
|
| + sk_sp<SkImage> discardable_image;
|
| discardable_image = CreateDiscardableImage(gfx::Size(10, 10));
|
|
|
| DiscardableImageMap image_map;
|
|
|