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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/playback/display_list_raster_source_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
« no previous file with comments | « cc/playback/display_list_raster_source.cc ('k') | cc/playback/display_list_recording_source_unittest.cc » ('j') | cc/playback/pixel_ref_map.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/playback/display_list_raster_source_unittest.cc
diff --git a/cc/playback/display_list_raster_source_unittest.cc b/cc/playback/display_list_raster_source_unittest.cc
index 6cb201b3006314a2beaba7ed0cf1934af88f5265..4e8a783a976865435a6541cfe5a8d0bee56cb033 100644
--- a/cc/playback/display_list_raster_source_unittest.cc
+++ b/cc/playback/display_list_raster_source_unittest.cc
@@ -200,72 +200,102 @@ TEST(DisplayListRasterSourceTest, PixelRefIteratorDiscardableRefsOneTile) {
// Tile sized iterators. These should find only one pixel ref.
{
- std::vector<SkPixelRef*> pixel_refs;
+ std::vector<skia::PositionPixelRef> pixel_refs;
raster->GatherPixelRefs(gfx::Rect(0, 0, 256, 256), 1.0, &pixel_refs);
EXPECT_EQ(1u, pixel_refs.size());
- EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0]);
+ EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0].pixel_ref);
+ EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
}
{
- std::vector<SkPixelRef*> pixel_refs;
+ std::vector<skia::PositionPixelRef> pixel_refs;
raster->GatherPixelRefs(gfx::Rect(0, 0, 512, 512), 2.0, &pixel_refs);
EXPECT_EQ(1u, pixel_refs.size());
- EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0]);
+ EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0].pixel_ref);
+ EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
}
{
- std::vector<SkPixelRef*> pixel_refs;
+ std::vector<skia::PositionPixelRef> pixel_refs;
raster->GatherPixelRefs(gfx::Rect(0, 0, 128, 128), 0.5, &pixel_refs);
EXPECT_EQ(1u, pixel_refs.size());
- EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0]);
+ EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0].pixel_ref);
+ EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
}
// Shifted tile sized iterators. These should find only one pixel ref.
{
- std::vector<SkPixelRef*> pixel_refs;
+ std::vector<skia::PositionPixelRef> pixel_refs;
raster->GatherPixelRefs(gfx::Rect(260, 260, 256, 256), 1.0, &pixel_refs);
EXPECT_EQ(1u, pixel_refs.size());
- EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[0]);
+ EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[0].pixel_ref);
+ EXPECT_EQ(gfx::RectF(260, 260, 32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
}
{
- std::vector<SkPixelRef*> pixel_refs;
+ std::vector<skia::PositionPixelRef> pixel_refs;
raster->GatherPixelRefs(gfx::Rect(520, 520, 512, 512), 2.0, &pixel_refs);
EXPECT_EQ(1u, pixel_refs.size());
- EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[0]);
+ EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[0].pixel_ref);
+ EXPECT_EQ(gfx::RectF(260, 260, 32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
}
{
- std::vector<SkPixelRef*> pixel_refs;
+ std::vector<skia::PositionPixelRef> pixel_refs;
raster->GatherPixelRefs(gfx::Rect(130, 130, 128, 128), 0.5, &pixel_refs);
EXPECT_EQ(1u, pixel_refs.size());
- EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[0]);
+ EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[0].pixel_ref);
+ EXPECT_EQ(gfx::RectF(260, 260, 32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
}
// Ensure there's no discardable pixel refs in the empty cell
{
- std::vector<SkPixelRef*> pixel_refs;
+ std::vector<skia::PositionPixelRef> pixel_refs;
raster->GatherPixelRefs(gfx::Rect(0, 256, 256, 256), 1.0, &pixel_refs);
EXPECT_EQ(0u, pixel_refs.size());
}
// Layer sized iterators. These should find three pixel ref.
{
- std::vector<SkPixelRef*> pixel_refs;
+ std::vector<skia::PositionPixelRef> pixel_refs;
raster->GatherPixelRefs(gfx::Rect(0, 0, 512, 512), 1.0, &pixel_refs);
EXPECT_EQ(3u, pixel_refs.size());
- EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0]);
- EXPECT_EQ(discardable_bitmap[0][1].pixelRef(), pixel_refs[1]);
- EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[2]);
+ EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0].pixel_ref);
+ EXPECT_EQ(discardable_bitmap[0][1].pixelRef(), pixel_refs[1].pixel_ref);
+ EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[2].pixel_ref);
+ EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
+ EXPECT_EQ(gfx::RectF(260, 0, 32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect).ToString());
+ EXPECT_EQ(gfx::RectF(260, 260, 32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect).ToString());
}
{
- std::vector<SkPixelRef*> pixel_refs;
+ std::vector<skia::PositionPixelRef> pixel_refs;
raster->GatherPixelRefs(gfx::Rect(0, 0, 1024, 1024), 2.0, &pixel_refs);
EXPECT_EQ(3u, pixel_refs.size());
- EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0]);
- EXPECT_EQ(discardable_bitmap[0][1].pixelRef(), pixel_refs[1]);
- EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[2]);
+ EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0].pixel_ref);
+ EXPECT_EQ(discardable_bitmap[0][1].pixelRef(), pixel_refs[1].pixel_ref);
+ EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[2].pixel_ref);
+ EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
+ EXPECT_EQ(gfx::RectF(260, 0, 32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect).ToString());
+ EXPECT_EQ(gfx::RectF(260, 260, 32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect).ToString());
}
{
- std::vector<SkPixelRef*> pixel_refs;
+ std::vector<skia::PositionPixelRef> pixel_refs;
raster->GatherPixelRefs(gfx::Rect(0, 0, 256, 256), 0.5, &pixel_refs);
EXPECT_EQ(3u, pixel_refs.size());
- EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0]);
- EXPECT_EQ(discardable_bitmap[0][1].pixelRef(), pixel_refs[1]);
- EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[2]);
+ EXPECT_EQ(discardable_bitmap[0][0].pixelRef(), pixel_refs[0].pixel_ref);
+ EXPECT_EQ(discardable_bitmap[0][1].pixelRef(), pixel_refs[1].pixel_ref);
+ EXPECT_EQ(discardable_bitmap[1][1].pixelRef(), pixel_refs[2].pixel_ref);
+ EXPECT_EQ(gfx::RectF(32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
+ EXPECT_EQ(gfx::RectF(260, 0, 32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect).ToString());
+ EXPECT_EQ(gfx::RectF(260, 260, 32, 32).ToString(),
+ gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect).ToString());
}
}
« no previous file with comments | « cc/playback/display_list_raster_source.cc ('k') | cc/playback/display_list_recording_source_unittest.cc » ('j') | cc/playback/pixel_ref_map.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698