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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/playback/recording_source_unittest.cc

Issue 2629233002: cc: Remove separate x/y raster scales. (Closed)
Patch Set: Created 3 years, 11 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/raster_source_unittest.cc ('k') | cc/raster/bitmap_raster_buffer_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/playback/recording_source_unittest.cc
diff --git a/cc/playback/recording_source_unittest.cc b/cc/playback/recording_source_unittest.cc
index 32c7ba9de3db67f99f98bcacf6b24506f2b0ac12..09f9aec4e072a086ba03951d8a888e1b4e130c8b 100644
--- a/cc/playback/recording_source_unittest.cc
+++ b/cc/playback/recording_source_unittest.cc
@@ -78,8 +78,8 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
// Tile sized iterators. These should find only one pixel ref.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128), 1.f,
+ &images);
EXPECT_EQ(2u, images.size());
EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
EXPECT_TRUE(images[1].image() == discardable_image[1][1]);
@@ -89,7 +89,7 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
{
std::vector<DrawImage> images;
raster_source->GetDiscardableImagesInRect(gfx::Rect(130, 140, 128, 128),
- gfx::SizeF(1.f, 1.f), &images);
+ 1.f, &images);
EXPECT_EQ(1u, images.size());
EXPECT_TRUE(images[0].image() == discardable_image[1][1]);
}
@@ -97,8 +97,8 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
// The rotated bitmap would still be in the top right tile.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(130, 0, 128, 128),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(130, 0, 128, 128), 1.f,
+ &images);
EXPECT_EQ(1u, images.size());
EXPECT_TRUE(images[0].image() == discardable_image[1][1]);
}
@@ -106,8 +106,8 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
// Layer sized iterators. These should find all pixel refs.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f,
+ &images);
EXPECT_EQ(3u, images.size());
// Top left tile with bitmap[0][0] and bitmap[1][1].
EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
@@ -116,15 +116,13 @@ TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
}
// Verify different raster scales
- for (float x_scale = 1.f; x_scale <= 5.f; x_scale += 0.5f) {
- for (float y_scale = 1.f; y_scale <= 5.f; y_scale += 0.5f) {
- std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(
- gfx::Rect(130, 0, 128, 128), gfx::SizeF(x_scale, y_scale), &images);
- EXPECT_EQ(1u, images.size());
- EXPECT_FLOAT_EQ(x_scale, images[0].scale().width());
- EXPECT_FLOAT_EQ(y_scale, images[0].scale().height());
- }
+ for (float scale = 1.f; scale <= 5.f; scale += 0.5f) {
+ std::vector<DrawImage> images;
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(130, 0, 128, 128),
+ scale, &images);
+ EXPECT_EQ(1u, images.size());
+ EXPECT_FLOAT_EQ(scale, images[0].scale().width());
+ EXPECT_FLOAT_EQ(scale, images[0].scale().height());
}
}
@@ -143,8 +141,7 @@ TEST(RecordingSourceTest, NoGatherImageEmptyImages) {
// get images.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(recorded_viewport,
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(recorded_viewport, 1.f, &images);
EXPECT_TRUE(images.empty());
}
}
@@ -163,22 +160,22 @@ TEST(RecordingSourceTest, EmptyImages) {
// Tile sized iterators.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128), 1.f,
+ &images);
EXPECT_TRUE(images.empty());
}
// Shifted tile sized iterators.
{
std::vector<DrawImage> images;
raster_source->GetDiscardableImagesInRect(gfx::Rect(140, 140, 128, 128),
- gfx::SizeF(1.f, 1.f), &images);
+ 1.f, &images);
EXPECT_TRUE(images.empty());
}
// Layer sized iterators.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f,
+ &images);
EXPECT_TRUE(images.empty());
}
}
@@ -218,22 +215,22 @@ TEST(RecordingSourceTest, NoDiscardableImages) {
// Tile sized iterators.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128), 1.f,
+ &images);
EXPECT_TRUE(images.empty());
}
// Shifted tile sized iterators.
{
std::vector<DrawImage> images;
raster_source->GetDiscardableImagesInRect(gfx::Rect(140, 140, 128, 128),
- gfx::SizeF(1.f, 1.f), &images);
+ 1.f, &images);
EXPECT_TRUE(images.empty());
}
// Layer sized iterators.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f,
+ &images);
EXPECT_TRUE(images.empty());
}
}
@@ -268,8 +265,8 @@ TEST(RecordingSourceTest, DiscardableImages) {
// Tile sized iterators. These should find only one image.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128), 1.f,
+ &images);
EXPECT_EQ(1u, images.size());
EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
}
@@ -278,7 +275,7 @@ TEST(RecordingSourceTest, DiscardableImages) {
{
std::vector<DrawImage> images;
raster_source->GetDiscardableImagesInRect(gfx::Rect(140, 140, 128, 128),
- gfx::SizeF(1.f, 1.f), &images);
+ 1.f, &images);
EXPECT_EQ(1u, images.size());
EXPECT_TRUE(images[0].image() == discardable_image[1][1]);
}
@@ -286,16 +283,16 @@ TEST(RecordingSourceTest, DiscardableImages) {
// Ensure there's no discardable images in the empty cell
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(140, 0, 128, 128),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(140, 0, 128, 128), 1.f,
+ &images);
EXPECT_TRUE(images.empty());
}
// Layer sized iterators. These should find all 3 images.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f,
+ &images);
EXPECT_EQ(3u, images.size());
EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
EXPECT_TRUE(images[1].image() == discardable_image[1][0]);
@@ -341,8 +338,8 @@ TEST(RecordingSourceTest, DiscardableImagesBaseNonDiscardable) {
// Tile sized iterators. These should find only one image.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), 1.f,
+ &images);
EXPECT_EQ(1u, images.size());
EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
}
@@ -350,22 +347,22 @@ TEST(RecordingSourceTest, DiscardableImagesBaseNonDiscardable) {
{
std::vector<DrawImage> images;
raster_source->GetDiscardableImagesInRect(gfx::Rect(260, 260, 256, 256),
- gfx::SizeF(1.f, 1.f), &images);
+ 1.f, &images);
EXPECT_EQ(1u, images.size());
EXPECT_TRUE(images[0].image() == discardable_image[1][1]);
}
// Ensure there's no discardable images in the empty cell
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 256, 256, 256),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 256, 256, 256), 1.f,
+ &images);
EXPECT_TRUE(images.empty());
}
// Layer sized iterators. These should find three images.
{
std::vector<DrawImage> images;
- raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 512, 512),
- gfx::SizeF(1.f, 1.f), &images);
+ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 512, 512), 1.f,
+ &images);
EXPECT_EQ(3u, images.size());
EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
EXPECT_TRUE(images[1].image() == discardable_image[0][1]);
« no previous file with comments | « cc/playback/raster_source_unittest.cc ('k') | cc/raster/bitmap_raster_buffer_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698