cc/output/renderer_pixeltest.cc - Issue 789433003: [cc] Add nearest neighbor filtering for PictureLayer.

Unified Diff: cc/output/renderer_pixeltest.cc

Issue 789433003: [cc] Add nearest neighbor filtering for PictureLayer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Only SetNeedsDisplay|PushProperties if nearest_neighbor changed. Created 6 years 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

Index: cc/output/renderer_pixeltest.cc

diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc

index 53b5b986c17464aee7208dcea968d0d2a6407170..1c3f88204d74234aa1afb0229d9c7a4c9db82c67 100644

--- a/cc/output/renderer_pixeltest.cc

+++ b/cc/output/renderer_pixeltest.cc

@@ -1725,6 +1725,7 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadIdentityScale) {

gfx::Rect viewport(this->device_viewport_size_);

// TODO(enne): the renderer should figure this out on its own.

ResourceFormat texture_format = RGBA_8888;

+ bool nearest_neighbor = false;

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

@@ -1761,8 +1762,8 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadIdentityScale) {

blue_quad->SetNew(blue_shared_state,

viewport, // Intentionally bigger than clip.

gfx::Rect(), viewport, gfx::RectF(viewport),

- viewport.size(), texture_format, viewport, 1.f,

- blue_pile.get());

+ viewport.size(), nearest_neighbor, texture_format, viewport,

+ 1.f, blue_pile.get());

// One viewport-filling green quad.

scoped_refptr<FakePicturePileImpl> green_pile =

@@ -1780,7 +1781,8 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadIdentityScale) {

pass->CreateAndAppendDrawQuad<PictureDrawQuad>();

green_quad->SetNew(green_shared_state, viewport, gfx::Rect(), viewport,

gfx::RectF(0.f, 0.f, 1.f, 1.f), viewport.size(),

- texture_format, viewport, 1.f, green_pile.get());

+ nearest_neighbor, texture_format, viewport, 1.f,

+ green_pile.get());

RenderPassList pass_list;

pass_list.push_back(pass.Pass());

@@ -1796,6 +1798,7 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadOpacity) {

gfx::Size pile_tile_size(1000, 1000);

gfx::Rect viewport(this->device_viewport_size_);

ResourceFormat texture_format = RGBA_8888;

+ bool nearest_neighbor = false;

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

@@ -1818,8 +1821,8 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadOpacity) {

PictureDrawQuad* green_quad =

pass->CreateAndAppendDrawQuad<PictureDrawQuad>();

green_quad->SetNew(green_shared_state, viewport, gfx::Rect(), viewport,

- gfx::RectF(0, 0, 1, 1), viewport.size(), texture_format,

- viewport, 1.f, green_pile.get());

+ gfx::RectF(0, 0, 1, 1), viewport.size(), nearest_neighbor,

+ texture_format, viewport, 1.f, green_pile.get());

// One viewport-filling white quad.

scoped_refptr<FakePicturePileImpl> white_pile =

@@ -1836,8 +1839,8 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadOpacity) {

PictureDrawQuad* white_quad =

pass->CreateAndAppendDrawQuad<PictureDrawQuad>();

white_quad->SetNew(white_shared_state, viewport, gfx::Rect(), viewport,

- gfx::RectF(0, 0, 1, 1), viewport.size(), texture_format,

- viewport, 1.f, white_pile.get());

+ gfx::RectF(0, 0, 1, 1), viewport.size(), nearest_neighbor,

+ texture_format, viewport, 1.f, white_pile.get());

RenderPassList pass_list;

pass_list.push_back(pass.Pass());

@@ -1873,6 +1876,7 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadDisableImageFiltering) {

gfx::Size pile_tile_size(1000, 1000);

gfx::Rect viewport(this->device_viewport_size_);

ResourceFormat texture_format = RGBA_8888;

+ bool nearest_neighbor = false;

danakj 2014/12/09 19:44:45 should we add a pixel test for picture draw quad a

jackhou1 2014/12/10 01:04:15 Done. I just copied PictureDrawQuadDisableImageFil

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

@@ -1903,8 +1907,8 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadDisableImageFiltering) {

PictureDrawQuad* quad = pass->CreateAndAppendDrawQuad<PictureDrawQuad>();

quad->SetNew(shared_state, viewport, gfx::Rect(), viewport,

- gfx::RectF(0, 0, 2, 2), viewport.size(), texture_format,

- viewport, 1.f, pile.get());

+ gfx::RectF(0, 0, 2, 2), viewport.size(), nearest_neighbor,

+ texture_format, viewport, 1.f, pile.get());

RenderPassList pass_list;

pass_list.push_back(pass.Pass());

@@ -1922,6 +1926,7 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadNonIdentityScale) {

gfx::Rect viewport(this->device_viewport_size_);

// TODO(enne): the renderer should figure this out on its own.

ResourceFormat texture_format = RGBA_8888;

+ bool nearest_neighbor = false;

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

@@ -1954,15 +1959,15 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadNonIdentityScale) {

pass->CreateAndAppendDrawQuad<PictureDrawQuad>();

green_quad1->SetNew(top_right_green_shared_quad_state, green_rect1,

gfx::Rect(), green_rect1, gfx::RectF(green_rect1.size()),

- green_rect1.size(), texture_format, green_rect1, 1.f,

- green_pile.get());

+ green_rect1.size(), nearest_neighbor, texture_format,

+ green_rect1, 1.f, green_pile.get());

PictureDrawQuad* green_quad2 =

pass->CreateAndAppendDrawQuad<PictureDrawQuad>();

green_quad2->SetNew(top_right_green_shared_quad_state, green_rect2,

gfx::Rect(), green_rect2, gfx::RectF(green_rect2.size()),

- green_rect2.size(), texture_format, green_rect2, 1.f,

- green_pile.get());

+ green_rect2.size(), nearest_neighbor, texture_format,

+ green_rect2, 1.f, green_pile.get());

// Add a green clipped checkerboard in the bottom right to help test

// interleaving picture quad content and solid color content.

@@ -2030,7 +2035,7 @@ TYPED_TEST(RendererPixelTest, PictureDrawQuadNonIdentityScale) {

PictureDrawQuad* blue_quad = pass->CreateAndAppendDrawQuad<PictureDrawQuad>();

blue_quad->SetNew(blue_shared_state, quad_content_rect, gfx::Rect(),

quad_content_rect, gfx::RectF(quad_content_rect),

- content_union_rect.size(), texture_format,

+ content_union_rect.size(), nearest_neighbor, texture_format,

content_union_rect, contents_scale, pile.get());

// Fill left half of viewport with green.

@@ -2215,6 +2220,7 @@ TEST_F(GLRendererPixelTest, PictureDrawQuadTexture4444) {

gfx::Size pile_tile_size(1000, 1000);

gfx::Rect viewport(this->device_viewport_size_);

ResourceFormat texture_format = RGBA_4444;

+ bool nearest_neighbor = false;

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

@@ -2236,7 +2242,8 @@ TEST_F(GLRendererPixelTest, PictureDrawQuadTexture4444) {

PictureDrawQuad* blue_quad = pass->CreateAndAppendDrawQuad<PictureDrawQuad>();

blue_quad->SetNew(blue_shared_state, viewport, gfx::Rect(), viewport,

gfx::RectF(0.f, 0.f, 1.f, 1.f), viewport.size(),

- texture_format, viewport, 1.f, blue_pile.get());

+ nearest_neighbor, texture_format, viewport, 1.f,

+ blue_pile.get());

RenderPassList pass_list;

pass_list.push_back(pass.Pass());

« cc/output/gl_renderer.cc ('K') | « cc/output/gl_renderer.cc ('k') | cc/output/software_renderer_unittest.cc » ('j') | no next file with comments »