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

Unified Diff: cc/tiles/checker_image_tracker_unittest.cc

Issue 2939243002: cc/blink: Veto checker-imaging for multipart image resources. (Closed)
Patch Set: tested Created 3 years, 6 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/tiles/checker_image_tracker.cc ('k') | third_party/WebKit/Source/core/loader/resource/ImageResource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a0dd0225895fd877f216240192926711799e115f..aee6773bb9c84edff6e9cd4cf89e4f7bceeb0fb3 100644
--- a/cc/tiles/checker_image_tracker_unittest.cc
+++ b/cc/tiles/checker_image_tracker_unittest.cc
@@ -93,7 +93,8 @@ class CheckerImageTrackerTest : public testing::Test,
ImageType image_type,
PaintImage::AnimationType animation = PaintImage::AnimationType::STATIC,
PaintImage::CompletionState completion =
- PaintImage::CompletionState::DONE) {
+ PaintImage::CompletionState::DONE,
+ bool is_multipart = false) {
int dimension = 0;
switch (image_type) {
case ImageType::CHECKERABLE:
@@ -109,10 +110,10 @@ class CheckerImageTrackerTest : public testing::Test,
sk_sp<SkImage> image =
CreateDiscardableImage(gfx::Size(dimension, dimension));
- return DrawImage(
- PaintImage(PaintImage::GetNextId(), image, animation, completion),
- SkIRect::MakeWH(dimension, dimension), kNone_SkFilterQuality,
- SkMatrix::I(), gfx::ColorSpace());
+ return DrawImage(PaintImage(PaintImage::GetNextId(), image, animation,
+ completion, 1, is_multipart),
+ SkIRect::MakeWH(dimension, dimension),
+ kNone_SkFilterQuality, SkMatrix::I(), gfx::ColorSpace());
}
CheckerImageTracker::ImageDecodeQueue BuildImageDecodeQueue(
@@ -471,5 +472,21 @@ TEST_F(CheckerImageTrackerTest, ChoosesMaxScaleAndQuality) {
kHigh_SkFilterQuality);
}
+TEST_F(CheckerImageTrackerTest, DontCheckerMultiPartImages) {
+ SetUpTracker(true);
+
+ DrawImage image = CreateImage(ImageType::CHECKERABLE);
+ EXPECT_FALSE(image.paint_image().is_multipart());
+ DrawImage multi_part_image =
+ CreateImage(ImageType::CHECKERABLE, PaintImage::AnimationType::STATIC,
+ PaintImage::CompletionState::DONE, true);
+ EXPECT_TRUE(multi_part_image.paint_image().is_multipart());
+
+ EXPECT_TRUE(checker_image_tracker_->ShouldCheckerImage(
+ image, WhichTree::PENDING_TREE));
+ EXPECT_FALSE(checker_image_tracker_->ShouldCheckerImage(
+ multi_part_image, WhichTree::PENDING_TREE));
+}
+
} // namespace
} // namespace cc
« no previous file with comments | « cc/tiles/checker_image_tracker.cc ('k') | third_party/WebKit/Source/core/loader/resource/ImageResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698