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

Unified Diff: cc/tiles/decoded_image_tracker_unittest.cc

Issue 2928433003: cc: Add scaling for checkered images. (Closed)
Patch Set: fixd tests 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
Index: cc/tiles/decoded_image_tracker_unittest.cc
diff --git a/cc/tiles/decoded_image_tracker_unittest.cc b/cc/tiles/decoded_image_tracker_unittest.cc
index 6b8b25ab02fb9c217d18303fe3f18aa3fa293944..ef835ed2c2fc9e303bb1649592e26ed557c196ee 100644
--- a/cc/tiles/decoded_image_tracker_unittest.cc
+++ b/cc/tiles/decoded_image_tracker_unittest.cc
@@ -5,6 +5,7 @@
#include <vector>
#include "base/bind.h"
+#include "cc/test/skia_common.h"
#include "cc/tiles/decoded_image_tracker.h"
#include "cc/tiles/image_controller.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,7 +23,7 @@ class TestImageController : public ImageController {
}
ImageDecodeRequestId QueueImageDecode(
- sk_sp<const SkImage> image,
+ const DrawImage& image,
const ImageDecodedCallback& callback) override {
auto id = next_id_++;
locked_ids_.push_back(id);
@@ -56,8 +57,9 @@ class DecodedImageTrackerTest : public testing::Test {
TEST_F(DecodedImageTrackerTest, QueueImageLocksImages) {
bool locked = false;
decoded_image_tracker()->QueueImageDecode(
- nullptr, base::Bind([](bool* locked, bool success) { *locked = true; },
- base::Unretained(&locked)));
+ CreateDiscardableImage(gfx::Size(1, 1)),
+ base::Bind([](bool* locked, bool success) { *locked = true; },
+ base::Unretained(&locked)));
EXPECT_TRUE(locked);
EXPECT_EQ(1u, image_controller()->num_locked_images());
}
@@ -65,8 +67,9 @@ TEST_F(DecodedImageTrackerTest, QueueImageLocksImages) {
TEST_F(DecodedImageTrackerTest, NotifyFrameFinishedUnlocksImages) {
bool locked = false;
decoded_image_tracker()->QueueImageDecode(
- nullptr, base::Bind([](bool* locked, bool success) { *locked = true; },
- base::Unretained(&locked)));
+ CreateDiscardableImage(gfx::Size(1, 1)),
+ base::Bind([](bool* locked, bool success) { *locked = true; },
+ base::Unretained(&locked)));
EXPECT_TRUE(locked);
EXPECT_EQ(1u, image_controller()->num_locked_images());
@@ -75,8 +78,9 @@ TEST_F(DecodedImageTrackerTest, NotifyFrameFinishedUnlocksImages) {
locked = false;
decoded_image_tracker()->QueueImageDecode(
- nullptr, base::Bind([](bool* locked, bool success) { *locked = true; },
- base::Unretained(&locked)));
+ CreateDiscardableImage(gfx::Size(1, 1)),
+ base::Bind([](bool* locked, bool success) { *locked = true; },
+ base::Unretained(&locked)));
EXPECT_TRUE(locked);
EXPECT_EQ(2u, image_controller()->num_locked_images());

Powered by Google App Engine
This is Rietveld 408576698