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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/playback/pixel_ref_map_unittest.cc

Issue 1279843004: cc: Plumb more details about pixel refs to tile manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« cc/playback/pixel_ref_map.cc ('K') | « cc/playback/pixel_ref_map.cc ('k') | cc/playback/raster_source.h » ('j') | skia/ext/pixel_ref_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/playback/pixel_ref_map_unittest.cc
diff --git a/cc/playback/pixel_ref_map_unittest.cc b/cc/playback/pixel_ref_map_unittest.cc
index af88b44c8731cc4c37005d3345917b752a635d2f..c56ff6a4e7444417c8735d6d7e0ef7e12c677953 100644
--- a/cc/playback/pixel_ref_map_unittest.cc
+++ b/cc/playback/pixel_ref_map_unittest.cc
@@ -65,8 +65,10 @@ TEST(PixelRefMapTest, PixelRefMapIterator) {
picture.get());
if ((x + y) & 1) {
EXPECT_TRUE(iterator) << x << " " << y;
- EXPECT_TRUE(*iterator == discardable_bitmap[y][x].pixelRef())
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[y][x].pixelRef())
<< x << " " << y;
+ EXPECT_EQ(gfx::RectF(x * 512 + 6, y * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_FALSE(++iterator) << x << " " << y;
} else {
EXPECT_FALSE(iterator) << x << " " << y;
@@ -78,40 +80,64 @@ TEST(PixelRefMapTest, PixelRefMapIterator) {
PixelRefMap::Iterator iterator(gfx::Rect(512, 512, 2048, 2048),
picture.get());
EXPECT_TRUE(iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[1][2].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][2].pixelRef());
+ EXPECT_EQ(gfx::RectF(2 * 512 + 6, 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[2][1].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2][1].pixelRef());
+ EXPECT_EQ(gfx::RectF(512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[2][3].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2][3].pixelRef());
+ EXPECT_EQ(gfx::RectF(3 * 512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[3][2].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[3][2].pixelRef());
+ EXPECT_EQ(gfx::RectF(2 * 512 + 6, 3 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_FALSE(++iterator);
}
- // Copy test.
- PixelRefMap::Iterator iterator(gfx::Rect(512, 512, 2048, 2048),
- picture.get());
- EXPECT_TRUE(iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[1][2].pixelRef());
- EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[2][1].pixelRef());
-
- // copy now points to the same spot as iterator,
- // but both can be incremented independently.
- PixelRefMap::Iterator copy = iterator;
- EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[2][3].pixelRef());
- EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[3][2].pixelRef());
- EXPECT_FALSE(++iterator);
-
- EXPECT_TRUE(copy);
- EXPECT_TRUE(*copy == discardable_bitmap[2][1].pixelRef());
- EXPECT_TRUE(++copy);
- EXPECT_TRUE(*copy == discardable_bitmap[2][3].pixelRef());
- EXPECT_TRUE(++copy);
- EXPECT_TRUE(*copy == discardable_bitmap[3][2].pixelRef());
- EXPECT_FALSE(++copy);
+ {
+ // Copy test.
+ PixelRefMap::Iterator iterator(gfx::Rect(512, 512, 2048, 2048),
+ picture.get());
+ EXPECT_TRUE(iterator);
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][2].pixelRef());
+ EXPECT_EQ(gfx::RectF(2 * 512 + 6, 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
+ EXPECT_TRUE(++iterator);
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2][1].pixelRef());
+ EXPECT_EQ(gfx::RectF(512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
+
+ // copy now points to the same spot as iterator,
+ // but both can be incremented independently.
+ PixelRefMap::Iterator copy = iterator;
+ EXPECT_TRUE(++iterator);
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2][3].pixelRef());
+ EXPECT_EQ(gfx::RectF(3 * 512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
+ EXPECT_TRUE(++iterator);
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[3][2].pixelRef());
+ EXPECT_EQ(gfx::RectF(2 * 512 + 6, 3 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
+ EXPECT_FALSE(++iterator);
+
+ EXPECT_TRUE(copy);
+ EXPECT_TRUE(copy->pixel_ref == discardable_bitmap[2][1].pixelRef());
+ EXPECT_EQ(gfx::RectF(512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(copy->pixel_ref_rect).ToString());
+ EXPECT_TRUE(++copy);
+ EXPECT_TRUE(copy->pixel_ref == discardable_bitmap[2][3].pixelRef());
+ EXPECT_EQ(gfx::RectF(3 * 512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(copy->pixel_ref_rect).ToString());
+ EXPECT_TRUE(++copy);
+ EXPECT_TRUE(copy->pixel_ref == discardable_bitmap[3][2].pixelRef());
+ EXPECT_EQ(gfx::RectF(2 * 512 + 6, 3 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(copy->pixel_ref_rect).ToString());
+ EXPECT_FALSE(++copy);
+ }
}
TEST(PixelRefMapTest, PixelRefMapIteratorNonZeroLayer) {
@@ -161,7 +187,10 @@ TEST(PixelRefMapTest, PixelRefMapIteratorNonZeroLayer) {
gfx::Rect(1024 + x * 512, y * 512, 500, 500), picture.get());
if ((x + y) & 1) {
EXPECT_TRUE(iterator) << x << " " << y;
- EXPECT_TRUE(*iterator == discardable_bitmap[y][x].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[y][x].pixelRef());
+ EXPECT_EQ(
+ gfx::RectF(1024 + x * 512 + 6, y * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_FALSE(++iterator) << x << " " << y;
} else {
EXPECT_FALSE(iterator) << x << " " << y;
@@ -173,13 +202,21 @@ TEST(PixelRefMapTest, PixelRefMapIteratorNonZeroLayer) {
PixelRefMap::Iterator iterator(gfx::Rect(1024 + 512, 512, 2048, 2048),
picture.get());
EXPECT_TRUE(iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[1][2].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][2].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 2 * 512 + 6, 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[2][1].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2][1].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[2][3].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2][3].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 3 * 512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[3][2].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[3][2].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 2 * 512 + 6, 3 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_FALSE(++iterator);
}
@@ -188,25 +225,39 @@ TEST(PixelRefMapTest, PixelRefMapIteratorNonZeroLayer) {
PixelRefMap::Iterator iterator(gfx::Rect(1024 + 512, 512, 2048, 2048),
picture.get());
EXPECT_TRUE(iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[1][2].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[1][2].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 2 * 512 + 6, 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[2][1].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2][1].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
// copy now points to the same spot as iterator,
// but both can be incremented independently.
PixelRefMap::Iterator copy = iterator;
EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[2][3].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2][3].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 3 * 512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_TRUE(++iterator);
- EXPECT_TRUE(*iterator == discardable_bitmap[3][2].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[3][2].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 2 * 512 + 6, 3 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_FALSE(++iterator);
EXPECT_TRUE(copy);
- EXPECT_TRUE(*copy == discardable_bitmap[2][1].pixelRef());
+ EXPECT_TRUE(copy->pixel_ref == discardable_bitmap[2][1].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(copy->pixel_ref_rect).ToString());
EXPECT_TRUE(++copy);
- EXPECT_TRUE(*copy == discardable_bitmap[2][3].pixelRef());
+ EXPECT_TRUE(copy->pixel_ref == discardable_bitmap[2][3].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 3 * 512 + 6, 2 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(copy->pixel_ref_rect).ToString());
EXPECT_TRUE(++copy);
- EXPECT_TRUE(*copy == discardable_bitmap[3][2].pixelRef());
+ EXPECT_TRUE(copy->pixel_ref == discardable_bitmap[3][2].pixelRef());
+ EXPECT_EQ(gfx::RectF(1024 + 2 * 512 + 6, 3 * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(copy->pixel_ref_rect).ToString());
EXPECT_FALSE(++copy);
}
@@ -279,7 +330,9 @@ TEST(PixelRefMapTest, PixelRefMapIteratorOnePixelQuery) {
picture.get());
if ((x + y) & 1) {
EXPECT_TRUE(iterator) << x << " " << y;
- EXPECT_TRUE(*iterator == discardable_bitmap[y][x].pixelRef());
+ EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[y][x].pixelRef());
+ EXPECT_EQ(gfx::RectF(x * 512 + 6, y * 512 + 6, 500, 500).ToString(),
+ gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
EXPECT_FALSE(++iterator) << x << " " << y;
} else {
EXPECT_FALSE(iterator) << x << " " << y;
« cc/playback/pixel_ref_map.cc ('K') | « cc/playback/pixel_ref_map.cc ('k') | cc/playback/raster_source.h » ('j') | skia/ext/pixel_ref_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698