diff options
author | jackhou <jackhou@chromium.org> | 2014-12-13 15:41:00 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-13 23:41:32 +0000 |
commit | 2422961898e84e420c0e12031ebb5147748ab490 (patch) | |
tree | fe767314b65e808575a9e12fe32f1bd255d3b6b4 /cc/quads/draw_quad_unittest.cc | |
parent | 9d04deed4364293a7f662d69cbbc23c4cab355f6 (diff) | |
download | chromium_src-2422961898e84e420c0e12031ebb5147748ab490.zip chromium_src-2422961898e84e420c0e12031ebb5147748ab490.tar.gz chromium_src-2422961898e84e420c0e12031ebb5147748ab490.tar.bz2 |
[cc] Add nearest neighbor filtering for PictureLayer.
Blink side here (depends on this CL):
https://codereview.chromium.org/782693003/
BUG=317991
Review URL: https://codereview.chromium.org/789433003
Cr-Commit-Position: refs/heads/master@{#308289}
Diffstat (limited to 'cc/quads/draw_quad_unittest.cc')
-rw-r--r-- | cc/quads/draw_quad_unittest.cc | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc index e65b326..97fea32 100644 --- a/cc/quads/draw_quad_unittest.cc +++ b/cc/quads/draw_quad_unittest.cc @@ -600,15 +600,17 @@ TEST(DrawQuadTest, CopyTileDrawQuad) { gfx::RectF tex_coord_rect(31.f, 12.f, 54.f, 20.f); gfx::Size texture_size(85, 32); bool swizzle_contents = true; + bool nearest_neighbor = true; CREATE_SHARED_STATE(); - CREATE_QUAD_6_NEW(TileDrawQuad, + CREATE_QUAD_7_NEW(TileDrawQuad, opaque_rect, visible_rect, resource_id, tex_coord_rect, texture_size, - swizzle_contents); + swizzle_contents, + nearest_neighbor); EXPECT_EQ(DrawQuad::TILED_CONTENT, copy_quad->material); EXPECT_EQ(opaque_rect, copy_quad->opaque_rect); EXPECT_EQ(visible_rect, copy_quad->visible_rect); @@ -616,17 +618,20 @@ TEST(DrawQuadTest, CopyTileDrawQuad) { 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); + EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor); - CREATE_QUAD_4_ALL(TileDrawQuad, + CREATE_QUAD_5_ALL(TileDrawQuad, resource_id, tex_coord_rect, texture_size, - swizzle_contents); + swizzle_contents, + nearest_neighbor); EXPECT_EQ(DrawQuad::TILED_CONTENT, copy_quad->material); 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); + EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor); } TEST(DrawQuadTest, CopyYUVVideoDrawQuad) { @@ -680,31 +685,34 @@ TEST(DrawQuadTest, CopyPictureDrawQuad) { gfx::Rect visible_rect(40, 50, 30, 20); gfx::RectF tex_coord_rect(31.f, 12.f, 54.f, 20.f); gfx::Size texture_size(85, 32); + bool nearest_neighbor = true; ResourceFormat texture_format = RGBA_8888; gfx::Rect content_rect(30, 40, 20, 30); float contents_scale = 3.141592f; scoped_refptr<RasterSource> raster_source = PicturePileImpl::Create(); CREATE_SHARED_STATE(); - CREATE_QUAD_8_NEW(PictureDrawQuad, opaque_rect, visible_rect, tex_coord_rect, - texture_size, texture_format, content_rect, contents_scale, - raster_source); + CREATE_QUAD_9_NEW(PictureDrawQuad, opaque_rect, visible_rect, tex_coord_rect, + texture_size, nearest_neighbor, texture_format, + content_rect, contents_scale, raster_source); EXPECT_EQ(DrawQuad::PICTURE_CONTENT, copy_quad->material); EXPECT_EQ(opaque_rect, copy_quad->opaque_rect); EXPECT_EQ(visible_rect, copy_quad->visible_rect); EXPECT_EQ(tex_coord_rect, copy_quad->tex_coord_rect); EXPECT_EQ(texture_size, copy_quad->texture_size); + EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor); EXPECT_EQ(texture_format, copy_quad->texture_format); EXPECT_EQ(content_rect, copy_quad->content_rect); EXPECT_EQ(contents_scale, copy_quad->contents_scale); EXPECT_EQ(raster_source, copy_quad->raster_source); - CREATE_QUAD_6_ALL(PictureDrawQuad, tex_coord_rect, texture_size, - texture_format, content_rect, contents_scale, - raster_source); + CREATE_QUAD_7_ALL(PictureDrawQuad, tex_coord_rect, texture_size, + nearest_neighbor, texture_format, content_rect, + contents_scale, raster_source); EXPECT_EQ(DrawQuad::PICTURE_CONTENT, copy_quad->material); EXPECT_EQ(tex_coord_rect, copy_quad->tex_coord_rect); EXPECT_EQ(texture_size, copy_quad->texture_size); + EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor); EXPECT_EQ(texture_format, copy_quad->texture_format); EXPECT_EQ(content_rect, copy_quad->content_rect); EXPECT_EQ(contents_scale, copy_quad->contents_scale); @@ -871,15 +879,17 @@ TEST_F(DrawQuadIteratorTest, TileDrawQuad) { gfx::RectF tex_coord_rect(31.f, 12.f, 54.f, 20.f); gfx::Size texture_size(85, 32); bool swizzle_contents = true; + bool nearest_neighbor = true; CREATE_SHARED_STATE(); - CREATE_QUAD_6_NEW(TileDrawQuad, + CREATE_QUAD_7_NEW(TileDrawQuad, opaque_rect, visible_rect, resource_id, tex_coord_rect, texture_size, - swizzle_contents); + swizzle_contents, + nearest_neighbor); EXPECT_EQ(resource_id, quad_new->resource_id); EXPECT_EQ(1, IterateAndCount(quad_new)); EXPECT_EQ(resource_id + 1, quad_new->resource_id); @@ -924,15 +934,16 @@ TEST_F(DrawQuadIteratorTest, DISABLED_PictureDrawQuad) { gfx::Rect visible_rect(40, 50, 30, 20); gfx::RectF tex_coord_rect(31.f, 12.f, 54.f, 20.f); gfx::Size texture_size(85, 32); + bool nearest_neighbor = true; ResourceFormat texture_format = RGBA_8888; gfx::Rect content_rect(30, 40, 20, 30); float contents_scale = 3.141592f; scoped_refptr<PicturePileImpl> raster_source = PicturePileImpl::Create(); CREATE_SHARED_STATE(); - CREATE_QUAD_8_NEW(PictureDrawQuad, opaque_rect, visible_rect, tex_coord_rect, - texture_size, texture_format, content_rect, contents_scale, - raster_source); + CREATE_QUAD_9_NEW(PictureDrawQuad, opaque_rect, visible_rect, tex_coord_rect, + texture_size, nearest_neighbor, texture_format, + content_rect, contents_scale, raster_source); EXPECT_EQ(0, IterateAndCount(quad_new)); } |