Index: cc/tiles/checker_image_tracker_unittest.cc |
diff --git a/cc/tiles/checker_image_tracker_unittest.cc b/cc/tiles/checker_image_tracker_unittest.cc |
index a60bcf75f5b4e2cdef444d4ad05e27b240577402..8d2539273b7f1f1ded6d770b001d3a9f65bc6308 100644 |
--- a/cc/tiles/checker_image_tracker_unittest.cc |
+++ b/cc/tiles/checker_image_tracker_unittest.cc |
@@ -83,6 +83,18 @@ class CheckerImageTrackerTest : public testing::Test, |
kNone_SkFilterQuality, SkMatrix::I()); |
} |
+ CheckerImageTracker::ImageDecodeQueue BuildImageDecodeQueue( |
+ std::vector<DrawImage> draw_images, |
+ WhichTree tree) { |
+ CheckerImageTracker::ImageDecodeQueue decode_queue; |
+ for (auto draw_image : draw_images) { |
+ sk_sp<const SkImage> image = draw_image.image(); |
+ if (checker_image_tracker_->ShouldCheckerImage(image, tree)) |
+ decode_queue.push_back(image); |
+ } |
+ return decode_queue; |
+ } |
+ |
// CheckerImageTrackerClient implementation. |
void NeedsInvalidationForCheckerImagedTiles() override { |
invalidation_request_pending_ = true; |
@@ -100,13 +112,10 @@ TEST_F(CheckerImageTrackerTest, CheckerImagesDisabled) { |
// disabled. |
SetUpTracker(false); |
- std::vector<DrawImage> draw_images; |
ImageIdFlatSet checkered_images; |
- draw_images.push_back(CreateImage(ImageType::CHECKERABLE)); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::PENDING_TREE); |
- EXPECT_EQ(draw_images.size(), 1U); |
- EXPECT_EQ(checkered_images.size(), 0U); |
+ DrawImage draw_image = CreateImage(ImageType::CHECKERABLE); |
+ EXPECT_FALSE(checker_image_tracker_->ShouldCheckerImage( |
+ draw_image.image(), WhichTree::PENDING_TREE)); |
EXPECT_EQ(image_controller_.num_of_locked_images(), 0); |
} |
@@ -116,20 +125,21 @@ TEST_F(CheckerImageTrackerTest, UpdatesImagesAtomically) { |
DrawImage checkerable_image = CreateImage(ImageType::CHECKERABLE); |
DrawImage non_checkerable_image = CreateImage(ImageType::NON_CHECKERABLE); |
- ImageIdFlatSet checkered_images; |
std::vector<DrawImage> draw_images; |
+ CheckerImageTracker::ImageDecodeQueue image_decode_queue; |
// First request to filter images. |
draw_images.push_back(checkerable_image); |
draw_images.push_back(non_checkerable_image); |
draw_images.push_back(checkerable_image); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::PENDING_TREE); |
+ image_decode_queue = |
+ BuildImageDecodeQueue(draw_images, WhichTree::PENDING_TREE); |
- EXPECT_EQ(draw_images.size(), 1U); |
- EXPECT_EQ(draw_images[0].image(), non_checkerable_image.image()); |
- EXPECT_EQ(checkered_images.size(), 1U); |
- EXPECT_EQ(checkered_images.count(checkerable_image.image()->uniqueID()), 1U); |
+ EXPECT_EQ(image_decode_queue.size(), 2U); |
+ EXPECT_EQ(image_decode_queue[0], checkerable_image.image()); |
+ EXPECT_EQ(image_decode_queue[1], checkerable_image.image()); |
+ |
+ checker_image_tracker_->ScheduleImageDecodeQueue(image_decode_queue); |
EXPECT_EQ(image_controller_.num_of_locked_images(), 1); |
// Run pending task to indicate completion of decode request to the tracker. |
@@ -142,14 +152,8 @@ TEST_F(CheckerImageTrackerTest, UpdatesImagesAtomically) { |
// Continue checkering the image until the set of images to invalidate is |
// pulled. |
- draw_images.clear(); |
- draw_images.push_back(checkerable_image); |
- checkered_images.clear(); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::PENDING_TREE); |
- EXPECT_EQ(draw_images.size(), 0U); |
- EXPECT_EQ(checkered_images.size(), 1U); |
- EXPECT_EQ(image_controller_.num_of_locked_images(), 1); |
+ EXPECT_TRUE(checker_image_tracker_->ShouldCheckerImage( |
+ checkerable_image.image(), WhichTree::PENDING_TREE)); |
ImageIdFlatSet invalidated_images = |
checker_image_tracker_->TakeImagesToInvalidateOnSyncTree(); |
@@ -159,27 +163,17 @@ TEST_F(CheckerImageTrackerTest, UpdatesImagesAtomically) { |
// Use the same set of draw images to ensure that they are not checkered on |
// the pending tree now. |
- draw_images.clear(); |
- draw_images.push_back(checkerable_image); |
- draw_images.push_back(non_checkerable_image); |
- checkered_images.clear(); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::PENDING_TREE); |
- EXPECT_EQ(draw_images.size(), 2U); |
- EXPECT_EQ(checkered_images.size(), 0U); |
+ EXPECT_FALSE(checker_image_tracker_->ShouldCheckerImage( |
+ checkerable_image.image(), WhichTree::PENDING_TREE)); |
+ EXPECT_FALSE(checker_image_tracker_->ShouldCheckerImage( |
+ non_checkerable_image.image(), WhichTree::PENDING_TREE)); |
// Use this set to make the same request from the active tree, we should |
// continue checkering this image on the active tree until activation. |
- draw_images.clear(); |
- draw_images.push_back(checkerable_image); |
- draw_images.push_back(non_checkerable_image); |
- checkered_images.clear(); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::ACTIVE_TREE); |
- EXPECT_EQ(draw_images.size(), 1U); |
- EXPECT_EQ(draw_images[0].image(), non_checkerable_image.image()); |
- EXPECT_EQ(checkered_images.size(), 1U); |
- EXPECT_EQ(checkered_images.count(checkerable_image.image()->uniqueID()), 1U); |
+ EXPECT_TRUE(checker_image_tracker_->ShouldCheckerImage( |
+ checkerable_image.image(), WhichTree::ACTIVE_TREE)); |
+ EXPECT_FALSE(checker_image_tracker_->ShouldCheckerImage( |
+ non_checkerable_image.image(), WhichTree::ACTIVE_TREE)); |
// Activate the sync tree. The images should be unlocked upon activation. |
EXPECT_EQ(image_controller_.num_of_locked_images(), 1); |
@@ -193,16 +187,14 @@ TEST_F(CheckerImageTrackerTest, NoConsecutiveCheckeringForImage) { |
DrawImage checkerable_image = CreateImage(ImageType::CHECKERABLE); |
DrawImage non_checkerable_image = CreateImage(ImageType::NON_CHECKERABLE); |
- ImageIdFlatSet checkered_images; |
std::vector<DrawImage> draw_images; |
draw_images.clear(); |
draw_images.push_back(checkerable_image); |
- checkered_images.clear(); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::PENDING_TREE); |
- EXPECT_EQ(draw_images.size(), 0U); |
- EXPECT_EQ(checkered_images.size(), 1U); |
+ CheckerImageTracker::ImageDecodeQueue image_decode_queue = |
+ BuildImageDecodeQueue(draw_images, WhichTree::PENDING_TREE); |
+ EXPECT_EQ(image_decode_queue.size(), 1U); |
+ checker_image_tracker_->ScheduleImageDecodeQueue(image_decode_queue); |
// Trigger decode completion, take images to invalidate and activate the sync |
// tree. |
@@ -211,13 +203,8 @@ TEST_F(CheckerImageTrackerTest, NoConsecutiveCheckeringForImage) { |
checker_image_tracker_->DidActivateSyncTree(); |
// Subsequent requests for this image should not be checkered. |
- draw_images.clear(); |
- draw_images.push_back(checkerable_image); |
- checkered_images.clear(); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::PENDING_TREE); |
- EXPECT_EQ(draw_images.size(), 1U); |
- EXPECT_EQ(checkered_images.size(), 0U); |
+ EXPECT_FALSE(checker_image_tracker_->ShouldCheckerImage( |
+ checkerable_image.image(), WhichTree::PENDING_TREE)); |
} |
TEST_F(CheckerImageTrackerTest, |
@@ -227,25 +214,20 @@ TEST_F(CheckerImageTrackerTest, |
SetUpTracker(true); |
DrawImage checkerable_image1 = CreateImage(ImageType::CHECKERABLE); |
- ImageIdFlatSet checkered_images; |
std::vector<DrawImage> draw_images; |
+ CheckerImageTracker::ImageDecodeQueue image_decode_queue; |
// First request to filter images on the pending and active tree. |
draw_images.push_back(checkerable_image1); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::PENDING_TREE); |
- EXPECT_EQ(draw_images.size(), 0U); |
- EXPECT_EQ(checkered_images.size(), 1U); |
+ image_decode_queue = |
+ BuildImageDecodeQueue(draw_images, WhichTree::PENDING_TREE); |
+ EXPECT_EQ(image_decode_queue.size(), 1U); |
+ checker_image_tracker_->ScheduleImageDecodeQueue(image_decode_queue); |
// The image is also checkered on the active tree while a decode request is |
// pending. |
- draw_images.clear(); |
- checkered_images.clear(); |
- draw_images.push_back(checkerable_image1); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::ACTIVE_TREE); |
- EXPECT_EQ(draw_images.size(), 0U); |
- EXPECT_EQ(checkered_images.size(), 1U); |
+ EXPECT_TRUE(checker_image_tracker_->ShouldCheckerImage( |
+ checkerable_image1.image(), WhichTree::ACTIVE_TREE)); |
// Trigger decode completion and take images to invalidate on the sync tree. |
base::RunLoop().RunUntilIdle(); |
@@ -258,40 +240,21 @@ TEST_F(CheckerImageTrackerTest, |
// Second request to filter the same image on the pending and active tree. It |
// should be checkered on the active tree, but not the pending tree. |
- draw_images.clear(); |
- checkered_images.clear(); |
- draw_images.push_back(checkerable_image1); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::PENDING_TREE); |
- EXPECT_EQ(draw_images.size(), 1U); |
- EXPECT_EQ(checkered_images.size(), 0U); |
- |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::ACTIVE_TREE); |
- EXPECT_EQ(draw_images.size(), 0U); |
- EXPECT_EQ(checkered_images.size(), 1U); |
+ EXPECT_TRUE(checker_image_tracker_->ShouldCheckerImage( |
+ checkerable_image1.image(), WhichTree::ACTIVE_TREE)); |
+ EXPECT_FALSE(checker_image_tracker_->ShouldCheckerImage( |
+ checkerable_image1.image(), WhichTree::PENDING_TREE)); |
// New checkerable image on the pending tree. |
DrawImage checkerable_image2 = CreateImage(ImageType::CHECKERABLE); |
- draw_images.clear(); |
- checkered_images.clear(); |
- draw_images.push_back(checkerable_image2); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::PENDING_TREE); |
- EXPECT_EQ(draw_images.size(), 0U); |
- EXPECT_EQ(checkered_images.size(), 1U); |
+ EXPECT_TRUE(checker_image_tracker_->ShouldCheckerImage( |
+ checkerable_image2.image(), WhichTree::PENDING_TREE)); |
// Activate the sync tree. The initial image should no longer be checkered on |
// the active tree. |
checker_image_tracker_->DidActivateSyncTree(); |
- |
- draw_images.clear(); |
- checkered_images.clear(); |
- draw_images.push_back(checkerable_image1); |
- checker_image_tracker_->FilterImagesForCheckeringForTile( |
- &draw_images, &checkered_images, WhichTree::ACTIVE_TREE); |
- EXPECT_EQ(draw_images.size(), 1U); |
- EXPECT_EQ(checkered_images.size(), 0U); |
+ EXPECT_FALSE(checker_image_tracker_->ShouldCheckerImage( |
+ checkerable_image1.image(), WhichTree::ACTIVE_TREE)); |
} |
} // namespace |