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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/quads/draw_quad_unittest.cc

Issue 1152473006: cc: Remove DrawQuad::IterateResoruces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iterators! Created 5 years, 7 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/quads/draw_quad.h ('K') | « cc/quads/draw_quad.cc ('k') | cc/quads/io_surface_draw_quad.h » ('j') | cc/surfaces/surface_aggregator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/quads/draw_quad_unittest.cc
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index e66bcdffe73a36f6589e134b2087e536f0830543..baa236b5c8ebc87bc8421e58d4f932154cd198df 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -418,13 +418,13 @@ TEST(DrawQuadTest, CopyIOSurfaceDrawQuad) {
EXPECT_EQ(visible_rect, copy_quad->visible_rect);
EXPECT_EQ(opaque_rect, copy_quad->opaque_rect);
EXPECT_EQ(size, copy_quad->io_surface_size);
- EXPECT_EQ(resource_id, copy_quad->io_surface_resource_id);
+ EXPECT_EQ(resource_id, copy_quad->io_surface_resource_id());
EXPECT_EQ(orientation, copy_quad->orientation);
CREATE_QUAD_3_ALL(IOSurfaceDrawQuad, size, resource_id, orientation);
EXPECT_EQ(DrawQuad::IO_SURFACE_CONTENT, copy_quad->material);
EXPECT_EQ(size, copy_quad->io_surface_size);
- EXPECT_EQ(resource_id, copy_quad->io_surface_resource_id);
+ EXPECT_EQ(resource_id, copy_quad->io_surface_resource_id());
EXPECT_EQ(orientation, copy_quad->orientation);
}
@@ -457,7 +457,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
EXPECT_EQ(visible_rect, copy_quad->visible_rect);
EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);
- EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id);
+ EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id());
EXPECT_EQ(mask_uv_scale.ToString(), copy_quad->mask_uv_scale.ToString());
EXPECT_EQ(mask_texture_size.ToString(),
copy_quad->mask_texture_size.ToString());
@@ -476,7 +476,7 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
copied_render_pass_id);
EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);
- EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id);
+ EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id());
EXPECT_EQ(mask_uv_scale.ToString(), copy_quad->mask_uv_scale.ToString());
EXPECT_EQ(mask_texture_size.ToString(),
copy_quad->mask_texture_size.ToString());
@@ -516,12 +516,12 @@ TEST(DrawQuadTest, CopyStreamVideoDrawQuad) {
EXPECT_EQ(DrawQuad::STREAM_VIDEO_CONTENT, copy_quad->material);
EXPECT_EQ(visible_rect, copy_quad->visible_rect);
EXPECT_EQ(opaque_rect, copy_quad->opaque_rect);
- EXPECT_EQ(resource_id, copy_quad->resource_id);
+ EXPECT_EQ(resource_id, copy_quad->resource_id());
EXPECT_EQ(matrix, copy_quad->matrix);
CREATE_QUAD_2_ALL(StreamVideoDrawQuad, resource_id, matrix);
EXPECT_EQ(DrawQuad::STREAM_VIDEO_CONTENT, copy_quad->material);
- EXPECT_EQ(resource_id, copy_quad->resource_id);
+ EXPECT_EQ(resource_id, copy_quad->resource_id());
EXPECT_EQ(matrix, copy_quad->matrix);
}
@@ -567,7 +567,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
EXPECT_EQ(visible_rect, copy_quad->visible_rect);
EXPECT_EQ(opaque_rect, copy_quad->opaque_rect);
- EXPECT_EQ(resource_id, copy_quad->resource_id);
+ EXPECT_EQ(resource_id, copy_quad->resource_id());
EXPECT_EQ(premultiplied_alpha, copy_quad->premultiplied_alpha);
EXPECT_EQ(uv_top_left, copy_quad->uv_top_left);
EXPECT_EQ(uv_bottom_right, copy_quad->uv_bottom_right);
@@ -585,7 +585,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
y_flipped,
nearest_neighbor);
EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
- EXPECT_EQ(resource_id, copy_quad->resource_id);
+ EXPECT_EQ(resource_id, copy_quad->resource_id());
EXPECT_EQ(premultiplied_alpha, copy_quad->premultiplied_alpha);
EXPECT_EQ(uv_top_left, copy_quad->uv_top_left);
EXPECT_EQ(uv_bottom_right, copy_quad->uv_bottom_right);
@@ -615,7 +615,7 @@ TEST(DrawQuadTest, CopyTileDrawQuad) {
EXPECT_EQ(DrawQuad::TILED_CONTENT, copy_quad->material);
EXPECT_EQ(opaque_rect, copy_quad->opaque_rect);
EXPECT_EQ(visible_rect, copy_quad->visible_rect);
- EXPECT_EQ(resource_id, copy_quad->resource_id);
+ EXPECT_EQ(resource_id, copy_quad->resource_id());
EXPECT_EQ(tex_coord_rect, copy_quad->tex_coord_rect);
EXPECT_EQ(texture_size, copy_quad->texture_size);
EXPECT_EQ(swizzle_contents, copy_quad->swizzle_contents);
@@ -628,7 +628,7 @@ TEST(DrawQuadTest, CopyTileDrawQuad) {
swizzle_contents,
nearest_neighbor);
EXPECT_EQ(DrawQuad::TILED_CONTENT, copy_quad->material);
- EXPECT_EQ(resource_id, copy_quad->resource_id);
+ EXPECT_EQ(resource_id, copy_quad->resource_id());
EXPECT_EQ(tex_coord_rect, copy_quad->tex_coord_rect);
EXPECT_EQ(texture_size, copy_quad->texture_size);
EXPECT_EQ(swizzle_contents, copy_quad->swizzle_contents);
@@ -660,10 +660,10 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) {
EXPECT_EQ(uv_tex_coord_rect, copy_quad->uv_tex_coord_rect);
EXPECT_EQ(ya_tex_size, copy_quad->ya_tex_size);
EXPECT_EQ(uv_tex_size, copy_quad->uv_tex_size);
- EXPECT_EQ(y_plane_resource_id, copy_quad->y_plane_resource_id);
- EXPECT_EQ(u_plane_resource_id, copy_quad->u_plane_resource_id);
- EXPECT_EQ(v_plane_resource_id, copy_quad->v_plane_resource_id);
- EXPECT_EQ(a_plane_resource_id, copy_quad->a_plane_resource_id);
+ EXPECT_EQ(y_plane_resource_id, copy_quad->y_plane_resource_id());
+ EXPECT_EQ(u_plane_resource_id, copy_quad->u_plane_resource_id());
+ EXPECT_EQ(v_plane_resource_id, copy_quad->v_plane_resource_id());
+ EXPECT_EQ(a_plane_resource_id, copy_quad->a_plane_resource_id());
EXPECT_EQ(color_space, copy_quad->color_space);
CREATE_QUAD_9_ALL(YUVVideoDrawQuad, ya_tex_coord_rect, uv_tex_coord_rect,
@@ -675,10 +675,10 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) {
EXPECT_EQ(uv_tex_coord_rect, copy_quad->uv_tex_coord_rect);
EXPECT_EQ(ya_tex_size, copy_quad->ya_tex_size);
EXPECT_EQ(uv_tex_size, copy_quad->uv_tex_size);
- EXPECT_EQ(y_plane_resource_id, copy_quad->y_plane_resource_id);
- EXPECT_EQ(u_plane_resource_id, copy_quad->u_plane_resource_id);
- EXPECT_EQ(v_plane_resource_id, copy_quad->v_plane_resource_id);
- EXPECT_EQ(a_plane_resource_id, copy_quad->a_plane_resource_id);
+ EXPECT_EQ(y_plane_resource_id, copy_quad->y_plane_resource_id());
+ EXPECT_EQ(u_plane_resource_id, copy_quad->u_plane_resource_id());
+ EXPECT_EQ(v_plane_resource_id, copy_quad->v_plane_resource_id());
+ EXPECT_EQ(a_plane_resource_id, copy_quad->a_plane_resource_id());
EXPECT_EQ(color_space, copy_quad->color_space);
}
@@ -732,8 +732,10 @@ class DrawQuadIteratorTest : public testing::Test {
int IterateAndCount(DrawQuad* quad) {
num_resources_ = 0;
- quad->IterateResources(base::Bind(
- &DrawQuadIteratorTest::IncrementResourceId, base::Unretained(this)));
+ for (ResourceId& resource_id : quad->resources) {
+ ++num_resources_;
+ ++resource_id;
+ }
return num_resources_;
}
@@ -775,9 +777,9 @@ TEST_F(DrawQuadIteratorTest, IOSurfaceDrawQuad) {
size,
resource_id,
orientation);
- EXPECT_EQ(resource_id, quad_new->io_surface_resource_id);
+ EXPECT_EQ(resource_id, quad_new->io_surface_resource_id());
EXPECT_EQ(1, IterateAndCount(quad_new));
- EXPECT_EQ(resource_id + 1, quad_new->io_surface_resource_id);
+ EXPECT_EQ(resource_id + 1, quad_new->io_surface_resource_id());
}
TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
@@ -806,12 +808,9 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
filters_scale,
background_filters,
copied_render_pass_id);
- EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id);
+ EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id());
EXPECT_EQ(1, IterateAndCount(quad_new));
- EXPECT_EQ(mask_resource_id + 1, quad_new->mask_resource_id);
- quad_new->mask_resource_id = 0;
- EXPECT_EQ(0, IterateAndCount(quad_new));
danakj 2015/05/28 20:57:37 Oh hm. This made it so we didn't iterate over 0 id
vmpstr 2015/05/28 22:36:59 This is handled differently now in that when mask_
- EXPECT_EQ(0u, quad_new->mask_resource_id);
+ EXPECT_EQ(mask_resource_id + 1, quad_new->mask_resource_id());
}
TEST_F(DrawQuadIteratorTest, SolidColorDrawQuad) {
@@ -834,9 +833,9 @@ TEST_F(DrawQuadIteratorTest, StreamVideoDrawQuad) {
CREATE_SHARED_STATE();
CREATE_QUAD_4_NEW(
StreamVideoDrawQuad, opaque_rect, visible_rect, resource_id, matrix);
- EXPECT_EQ(resource_id, quad_new->resource_id);
+ EXPECT_EQ(resource_id, quad_new->resource_id());
EXPECT_EQ(1, IterateAndCount(quad_new));
- EXPECT_EQ(resource_id + 1, quad_new->resource_id);
+ EXPECT_EQ(resource_id + 1, quad_new->resource_id());
}
TEST_F(DrawQuadIteratorTest, SurfaceDrawQuad) {
@@ -871,9 +870,9 @@ TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
vertex_opacity,
y_flipped,
nearest_neighbor);
- EXPECT_EQ(resource_id, quad_new->resource_id);
+ EXPECT_EQ(resource_id, quad_new->resource_id());
EXPECT_EQ(1, IterateAndCount(quad_new));
- EXPECT_EQ(resource_id + 1, quad_new->resource_id);
+ EXPECT_EQ(resource_id + 1, quad_new->resource_id());
}
TEST_F(DrawQuadIteratorTest, TileDrawQuad) {
@@ -894,9 +893,9 @@ TEST_F(DrawQuadIteratorTest, TileDrawQuad) {
texture_size,
swizzle_contents,
nearest_neighbor);
- EXPECT_EQ(resource_id, quad_new->resource_id);
+ EXPECT_EQ(resource_id, quad_new->resource_id());
EXPECT_EQ(1, IterateAndCount(quad_new));
- EXPECT_EQ(resource_id + 1, quad_new->resource_id);
+ EXPECT_EQ(resource_id + 1, quad_new->resource_id());
}
TEST_F(DrawQuadIteratorTest, YUVVideoDrawQuad) {
@@ -918,16 +917,16 @@ TEST_F(DrawQuadIteratorTest, YUVVideoDrawQuad) {
uv_tex_size, y_plane_resource_id, u_plane_resource_id,
v_plane_resource_id, a_plane_resource_id, color_space);
EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material);
- EXPECT_EQ(y_plane_resource_id, quad_new->y_plane_resource_id);
- EXPECT_EQ(u_plane_resource_id, quad_new->u_plane_resource_id);
- EXPECT_EQ(v_plane_resource_id, quad_new->v_plane_resource_id);
- EXPECT_EQ(a_plane_resource_id, quad_new->a_plane_resource_id);
+ EXPECT_EQ(y_plane_resource_id, quad_new->y_plane_resource_id());
+ EXPECT_EQ(u_plane_resource_id, quad_new->u_plane_resource_id());
+ EXPECT_EQ(v_plane_resource_id, quad_new->v_plane_resource_id());
+ EXPECT_EQ(a_plane_resource_id, quad_new->a_plane_resource_id());
EXPECT_EQ(color_space, quad_new->color_space);
EXPECT_EQ(4, IterateAndCount(quad_new));
- EXPECT_EQ(y_plane_resource_id + 1, quad_new->y_plane_resource_id);
- EXPECT_EQ(u_plane_resource_id + 1, quad_new->u_plane_resource_id);
- EXPECT_EQ(v_plane_resource_id + 1, quad_new->v_plane_resource_id);
- EXPECT_EQ(a_plane_resource_id + 1, quad_new->a_plane_resource_id);
+ EXPECT_EQ(y_plane_resource_id + 1, quad_new->y_plane_resource_id());
+ EXPECT_EQ(u_plane_resource_id + 1, quad_new->u_plane_resource_id());
+ EXPECT_EQ(v_plane_resource_id + 1, quad_new->v_plane_resource_id());
+ EXPECT_EQ(a_plane_resource_id + 1, quad_new->a_plane_resource_id());
}
// Disabled until picture draw quad is supported for ubercomp: crbug.com/231715
« cc/quads/draw_quad.h ('K') | « cc/quads/draw_quad.cc ('k') | cc/quads/io_surface_draw_quad.h » ('j') | cc/surfaces/surface_aggregator.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698