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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/playback/recording_source_unittest.cc

Issue 1900953004: Switch DrawImage to sk_sp<> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Florin's nit 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
« no previous file with comments | « cc/playback/raster_source_unittest.cc ('k') | cc/test/fake_content_layer_client.h » ('j') | cc/tiles/software_image_decode_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..878242db4d39fe3f8914b606a6ba61906a8add1a 100644
--- a/cc/playback/recording_source_unittest.cc
+++ b/cc/playback/recording_source_unittest.cc
@@ -13,6 +13,7 @@
#include "cc/test/fake_recording_source.h"
#include "cc/test/skia_common.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
namespace cc {
namespace {
@@ -101,7 +102,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.
@@ -121,11 +122,11 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
gfx::RectF rotate_rect = rect;
rotate_transform.TransformRect(&rotate_rect);
- recording_source->add_draw_image_with_transform(discardable_image[0][0].get(),
+ recording_source->add_draw_image_with_transform(discardable_image[0][0],
identity_transform);
- recording_source->add_draw_image_with_transform(discardable_image[1][0].get(),
+ recording_source->add_draw_image_with_transform(discardable_image[1][0],
translate_transform);
- recording_source->add_draw_image_with_transform(discardable_image[1][1].get(),
+ recording_source->add_draw_image_with_transform(discardable_image[1][1],
rotate_transform);
recording_source->SetGenerateDiscardableImagesMetadata(true);
recording_source->Rerecord();
@@ -141,8 +142,8 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128), 1.f,
&images);
EXPECT_EQ(2u, images.size());
- EXPECT_TRUE(images[0].image() == discardable_image[0][0].get());
- EXPECT_TRUE(images[1].image() == discardable_image[1][1].get());
+ EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
+ EXPECT_TRUE(images[1].image() == discardable_image[1][1]);
}
// Shifted tile sized iterators. These should find only one pixel ref.
@@ -151,7 +152,7 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
raster_source->GetDiscardableImagesInRect(gfx::Rect(130, 140, 128, 128),
1.f, &images);
EXPECT_EQ(1u, images.size());
- EXPECT_TRUE(images[0].image() == discardable_image[1][1].get());
+ EXPECT_TRUE(images[0].image() == discardable_image[1][1]);
}
// The rotated bitmap would still be in the top right tile.
@@ -160,7 +161,7 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
raster_source->GetDiscardableImagesInRect(gfx::Rect(130, 0, 128, 128), 1.f,
&images);
EXPECT_EQ(1u, images.size());
- EXPECT_TRUE(images[0].image() == discardable_image[1][1].get());
+ EXPECT_TRUE(images[0].image() == discardable_image[1][1]);
}
// Layer sized iterators. These should find all pixel refs.
@@ -170,9 +171,9 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
&images);
EXPECT_EQ(3u, images.size());
// Top left tile with bitmap[0][0] and bitmap[1][1].
- EXPECT_TRUE(images[0].image() == discardable_image[0][0].get());
- EXPECT_TRUE(images[1].image() == discardable_image[1][0].get());
- EXPECT_TRUE(images[2].image() == discardable_image[1][1].get());
+ EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
+ EXPECT_TRUE(images[1].image() == discardable_image[1][0]);
+ EXPECT_TRUE(images[2].image() == discardable_image[1][1]);
}
// Verify different raster scales
@@ -252,8 +253,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);
@@ -263,12 +264,9 @@ TEST(RecordingSourceTest, NoDiscardableImages) {
simple_paint);
recording_source->add_draw_rect_with_paint(gfx::Rect(0, 512, 256, 256),
simple_paint);
- recording_source->add_draw_image(non_discardable_image.get(),
- gfx::Point(128, 0));
- recording_source->add_draw_image(non_discardable_image.get(),
- gfx::Point(0, 128));
- recording_source->add_draw_image(non_discardable_image.get(),
- gfx::Point(150, 150));
+ recording_source->add_draw_image(non_discardable_image, gfx::Point(128, 0));
+ recording_source->add_draw_image(non_discardable_image, gfx::Point(0, 128));
+ recording_source->add_draw_image(non_discardable_image, gfx::Point(150, 150));
recording_source->SetGenerateDiscardableImagesMetadata(true);
recording_source->Rerecord();
@@ -304,7 +302,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));
@@ -315,11 +313,9 @@ TEST(RecordingSourceTest, DiscardableImages) {
// |---|---|
// | x | x |
// |---|---|
- recording_source->add_draw_image(discardable_image[0][0].get(),
- gfx::Point(0, 0));
- recording_source->add_draw_image(discardable_image[1][0].get(),
- gfx::Point(0, 130));
- recording_source->add_draw_image(discardable_image[1][1].get(),
+ recording_source->add_draw_image(discardable_image[0][0], gfx::Point(0, 0));
+ recording_source->add_draw_image(discardable_image[1][0], gfx::Point(0, 130));
+ recording_source->add_draw_image(discardable_image[1][1],
gfx::Point(140, 140));
recording_source->SetGenerateDiscardableImagesMetadata(true);
recording_source->Rerecord();
@@ -333,7 +329,7 @@ TEST(RecordingSourceTest, DiscardableImages) {
raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128), 1.f,
&images);
EXPECT_EQ(1u, images.size());
- EXPECT_TRUE(images[0].image() == discardable_image[0][0].get());
+ EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
}
// Shifted tile sized iterators. These should find only one image.
@@ -342,7 +338,7 @@ TEST(RecordingSourceTest, DiscardableImages) {
raster_source->GetDiscardableImagesInRect(gfx::Rect(140, 140, 128, 128),
1.f, &images);
EXPECT_EQ(1u, images.size());
- EXPECT_TRUE(images[0].image() == discardable_image[1][1].get());
+ EXPECT_TRUE(images[0].image() == discardable_image[1][1]);
}
// Ensure there's no discardable images in the empty cell
@@ -359,9 +355,9 @@ TEST(RecordingSourceTest, DiscardableImages) {
raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f,
&images);
EXPECT_EQ(3u, images.size());
- EXPECT_TRUE(images[0].image() == discardable_image[0][0].get());
- EXPECT_TRUE(images[1].image() == discardable_image[1][0].get());
- EXPECT_TRUE(images[2].image() == discardable_image[1][1].get());
+ EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
+ EXPECT_TRUE(images[1].image() == discardable_image[1][0]);
+ EXPECT_TRUE(images[2].image() == discardable_image[1][1]);
}
}
@@ -374,10 +370,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));
@@ -389,13 +385,10 @@ TEST(RecordingSourceTest, DiscardableImagesBaseNonDiscardable) {
// |---|---|
// | | x |
// |---|---|
- recording_source->add_draw_image(non_discardable_image.get(),
- gfx::Point(0, 0));
- recording_source->add_draw_image(discardable_image[0][0].get(),
- gfx::Point(0, 0));
- recording_source->add_draw_image(discardable_image[0][1].get(),
- gfx::Point(260, 0));
- recording_source->add_draw_image(discardable_image[1][1].get(),
+ recording_source->add_draw_image(non_discardable_image, gfx::Point(0, 0));
+ recording_source->add_draw_image(discardable_image[0][0], gfx::Point(0, 0));
+ recording_source->add_draw_image(discardable_image[0][1], gfx::Point(260, 0));
+ recording_source->add_draw_image(discardable_image[1][1],
gfx::Point(260, 260));
recording_source->SetGenerateDiscardableImagesMetadata(true);
recording_source->Rerecord();
@@ -409,7 +402,7 @@ TEST(RecordingSourceTest, DiscardableImagesBaseNonDiscardable) {
raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f,
&images);
EXPECT_EQ(1u, images.size());
- EXPECT_TRUE(images[0].image() == discardable_image[0][0].get());
+ EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
}
// Shifted tile sized iterators. These should find only one image.
{
@@ -417,7 +410,7 @@ TEST(RecordingSourceTest, DiscardableImagesBaseNonDiscardable) {
raster_source->GetDiscardableImagesInRect(gfx::Rect(260, 260, 256, 256),
1.f, &images);
EXPECT_EQ(1u, images.size());
- EXPECT_TRUE(images[0].image() == discardable_image[1][1].get());
+ EXPECT_TRUE(images[0].image() == discardable_image[1][1]);
}
// Ensure there's no discardable images in the empty cell
{
@@ -432,9 +425,9 @@ TEST(RecordingSourceTest, DiscardableImagesBaseNonDiscardable) {
raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 512, 512), 1.f,
&images);
EXPECT_EQ(3u, images.size());
- EXPECT_TRUE(images[0].image() == discardable_image[0][0].get());
- EXPECT_TRUE(images[1].image() == discardable_image[0][1].get());
- EXPECT_TRUE(images[2].image() == discardable_image[1][1].get());
+ EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
+ EXPECT_TRUE(images[1].image() == discardable_image[0][1]);
+ EXPECT_TRUE(images[2].image() == discardable_image[1][1]);
}
}
« no previous file with comments | « cc/playback/raster_source_unittest.cc ('k') | cc/test/fake_content_layer_client.h » ('j') | cc/tiles/software_image_decode_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698