cc/output/renderer_pixeltest.cc - Issue 2543473004: cc: Move filters from RenderPassDrawQuad to RenderPass

Unified Diff: cc/output/renderer_pixeltest.cc

Issue 2543473004: cc: Move filters from RenderPassDrawQuad to RenderPass (Closed)

Patch Set: Created 4 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

Index: cc/output/renderer_pixeltest.cc

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

index ffd204a9be180a56ad2ea8bdebc8a2d2bca96e0c..4403cdbeaa07dd203665b1f150b23d2cfdc58038 100644

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

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

@@ -39,18 +39,24 @@ std::unique_ptr<RenderPass> CreateTestRootRenderPass(RenderPassId id,

const gfx::Rect output_rect = rect;

const gfx::Rect damage_rect = rect;

const gfx::Transform transform_to_root_target;

- pass->SetNew(id, output_rect, damage_rect, transform_to_root_target);

+ const FilterOperations filters;

+ const FilterOperations background_filters;

+ pass->SetNew(id, output_rect, damage_rect, transform_to_root_target, filters,

+ background_filters);

return pass;

}

std::unique_ptr<RenderPass> CreateTestRenderPass(

RenderPassId id,

const gfx::Rect& rect,

- const gfx::Transform& transform_to_root_target) {

+ const gfx::Transform& transform_to_root_target,

+ const FilterOperations& filters,

+ const FilterOperations& background_filters) {

std::unique_ptr<RenderPass> pass = RenderPass::Create();

const gfx::Rect output_rect = rect;

const gfx::Rect damage_rect = rect;

- pass->SetNew(id, output_rect, damage_rect, transform_to_root_target);

+ pass->SetNew(id, output_rect, damage_rect, transform_to_root_target, filters,

+ background_filters);

return pass;

}

@@ -97,13 +103,11 @@ void CreateTestRenderPassDrawQuad(const SharedQuadState* shared_state,

RenderPassDrawQuad* quad =

render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();

quad->SetNew(shared_state, rect, rect, pass_id,

- 0, // mask_resource_id

- gfx::Vector2dF(), // mask_uv_scale

- gfx::Size(), // mask_texture_size

- FilterOperations(), // foreground filters

- gfx::Vector2dF(), // filters scale

- gfx::PointF(), // filter origin

- FilterOperations()); // background filters

+ 0, // mask_resource_id

+ gfx::Vector2dF(), // mask_uv_scale

+ gfx::Size(), // mask_texture_size

+ gfx::Vector2dF(), // filters scale

+ gfx::PointF()); // filter origin

}

void CreateTestTwoColoredTextureDrawQuad(const gfx::Rect& rect,

@@ -700,7 +704,8 @@ TYPED_TEST(RendererPixelTest, SimpleGreenRect_NonRootRenderPass) {

RenderPassId child_id(2, 1);

std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_id, small_rect, gfx::Transform());

+ CreateTestRenderPass(child_id, small_rect, gfx::Transform(),

+ FilterOperations(), FilterOperations());

SharedQuadState* child_shared_state =

CreateTestSharedQuadState(gfx::Transform(), small_rect, child_pass.get());

@@ -710,8 +715,8 @@ TYPED_TEST(RendererPixelTest, SimpleGreenRect_NonRootRenderPass) {

color_quad->SetNew(child_shared_state, rect, rect, SK_ColorGREEN, false);

RenderPassId root_id(1, 1);

- std::unique_ptr<RenderPass> root_pass =

- CreateTestRenderPass(root_id, rect, gfx::Transform());

+ std::unique_ptr<RenderPass> root_pass = CreateTestRenderPass(

+ root_id, rect, gfx::Transform(), FilterOperations(), FilterOperations());

SharedQuadState* root_shared_state =

CreateTestSharedQuadState(gfx::Transform(), rect, root_pass.get());

@@ -999,11 +1004,13 @@ TYPED_TEST(IntersectingQuadPixelTest, RenderPassQuads) {

RenderPassId child_pass_id1(2, 2);

RenderPassId child_pass_id2(2, 3);

std::unique_ptr<RenderPass> child_pass1 =

- CreateTestRenderPass(child_pass_id1, this->quad_rect_, gfx::Transform());

+ CreateTestRenderPass(child_pass_id1, this->quad_rect_, gfx::Transform(),

+ FilterOperations(), FilterOperations());

SharedQuadState* child1_quad_state = CreateTestSharedQuadState(

gfx::Transform(), this->quad_rect_, child_pass1.get());

std::unique_ptr<RenderPass> child_pass2 =

- CreateTestRenderPass(child_pass_id2, this->quad_rect_, gfx::Transform());

+ CreateTestRenderPass(child_pass_id2, this->quad_rect_, gfx::Transform(),

+ FilterOperations(), FilterOperations());

SharedQuadState* child2_quad_state = CreateTestSharedQuadState(

gfx::Transform(), this->quad_rect_, child_pass2.get());

@@ -1480,8 +1487,29 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) {

RenderPassId child_pass_id(2, 2);

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

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);

+ SkScalar matrix[20];

+ float amount = 0.5f;

+ matrix[0] = 0.213f + 0.787f * amount;

+ matrix[1] = 0.715f - 0.715f * amount;

+ matrix[2] = 1.f - (matrix[0] + matrix[1]);

+ matrix[3] = matrix[4] = 0;

+ matrix[5] = 0.213f - 0.213f * amount;

+ matrix[6] = 0.715f + 0.285f * amount;

+ matrix[7] = 1.f - (matrix[5] + matrix[6]);

+ matrix[8] = matrix[9] = 0;

+ matrix[10] = 0.213f - 0.213f * amount;

+ matrix[11] = 0.715f - 0.715f * amount;

+ matrix[12] = 1.f - (matrix[10] + matrix[11]);

+ matrix[13] = matrix[14] = 0;

+ matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0;

+ matrix[18] = 1;

+ FilterOperations filters;

+ filters.Append(

+ FilterOperation::CreateReferenceFilter(SkColorFilterImageFilter::Make(

+ SkColorFilter::MakeMatrixFilterRowMajor255(matrix), nullptr)));

+ std::unique_ptr<RenderPass> child_pass = CreateTestRenderPass(

+ child_pass_id, pass_rect, transform_to_root, filters, FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state = CreateTestSharedQuadState(

@@ -1514,33 +1542,11 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlpha) {

SharedQuadState* pass_shared_state =

CreateTestSharedQuadState(gfx::Transform(), pass_rect, root_pass.get());

- SkScalar matrix[20];

- float amount = 0.5f;

- matrix[0] = 0.213f + 0.787f * amount;

- matrix[1] = 0.715f - 0.715f * amount;

- matrix[2] = 1.f - (matrix[0] + matrix[1]);

- matrix[3] = matrix[4] = 0;

- matrix[5] = 0.213f - 0.213f * amount;

- matrix[6] = 0.715f + 0.285f * amount;

- matrix[7] = 1.f - (matrix[5] + matrix[6]);

- matrix[8] = matrix[9] = 0;

- matrix[10] = 0.213f - 0.213f * amount;

- matrix[11] = 0.715f - 0.715f * amount;

- matrix[12] = 1.f - (matrix[10] + matrix[11]);

- matrix[13] = matrix[14] = 0;

- matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0;

- matrix[18] = 1;

- FilterOperations filters;

- filters.Append(

- FilterOperation::CreateReferenceFilter(SkColorFilterImageFilter::Make(

- SkColorFilter::MakeMatrixFilterRowMajor255(matrix), nullptr)));

RenderPassDrawQuad* render_pass_quad =

root_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();

render_pass_quad->SetNew(pass_shared_state, pass_rect, pass_rect,

child_pass_id, 0, gfx::Vector2dF(), gfx::Size(),

- filters, gfx::Vector2dF(), gfx::PointF(),

- FilterOperations());

+ gfx::Vector2dF(), gfx::PointF());

RenderPassList pass_list;

pass_list.push_back(std::move(child_pass));

@@ -1564,8 +1570,11 @@ TYPED_TEST(RendererPixelTest, FastPassSaturateFilter) {

RenderPassId child_pass_id(2, 2);

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

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);

+ FilterOperations filters;

+ filters.Append(FilterOperation::CreateSaturateFilter(0.5f));

+ std::unique_ptr<RenderPass> child_pass = CreateTestRenderPass(

+ child_pass_id, pass_rect, transform_to_root, filters, FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state = CreateTestSharedQuadState(

@@ -1598,15 +1607,11 @@ TYPED_TEST(RendererPixelTest, FastPassSaturateFilter) {

SharedQuadState* pass_shared_state =

CreateTestSharedQuadState(gfx::Transform(), pass_rect, root_pass.get());

- FilterOperations filters;

- filters.Append(FilterOperation::CreateSaturateFilter(0.5f));

RenderPassDrawQuad* render_pass_quad =

root_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();

render_pass_quad->SetNew(pass_shared_state, pass_rect, pass_rect,

child_pass_id, 0, gfx::Vector2dF(), gfx::Size(),

- filters, gfx::Vector2dF(), gfx::PointF(),

- FilterOperations());

+ gfx::Vector2dF(), gfx::PointF());

RenderPassList pass_list;

pass_list.push_back(std::move(child_pass));

@@ -1629,8 +1634,12 @@ TYPED_TEST(RendererPixelTest, FastPassFilterChain) {

RenderPassId child_pass_id(2, 2);

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

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);

+ FilterOperations filters;

+ filters.Append(FilterOperation::CreateGrayscaleFilter(1.f));

+ filters.Append(FilterOperation::CreateBrightnessFilter(0.5f));

+ std::unique_ptr<RenderPass> child_pass = CreateTestRenderPass(

+ child_pass_id, pass_rect, transform_to_root, filters, FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state = CreateTestSharedQuadState(

@@ -1663,16 +1672,11 @@ TYPED_TEST(RendererPixelTest, FastPassFilterChain) {

SharedQuadState* pass_shared_state =

CreateTestSharedQuadState(gfx::Transform(), pass_rect, root_pass.get());

- FilterOperations filters;

- filters.Append(FilterOperation::CreateGrayscaleFilter(1.f));

- filters.Append(FilterOperation::CreateBrightnessFilter(0.5f));

RenderPassDrawQuad* render_pass_quad =

root_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();

render_pass_quad->SetNew(pass_shared_state, pass_rect, pass_rect,

child_pass_id, 0, gfx::Vector2dF(), gfx::Size(),

- filters, gfx::Vector2dF(), gfx::PointF(),

- FilterOperations());

+ gfx::Vector2dF(), gfx::PointF());

RenderPassList pass_list;

pass_list.push_back(std::move(child_pass));

@@ -1696,8 +1700,32 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) {

RenderPassId child_pass_id(2, 2);

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

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);

+ SkScalar matrix[20];

+ float amount = 0.5f;

+ matrix[0] = 0.213f + 0.787f * amount;

+ matrix[1] = 0.715f - 0.715f * amount;

+ matrix[2] = 1.f - (matrix[0] + matrix[1]);

+ matrix[3] = 0;

+ matrix[4] = 20.f;

+ matrix[5] = 0.213f - 0.213f * amount;

+ matrix[6] = 0.715f + 0.285f * amount;

+ matrix[7] = 1.f - (matrix[5] + matrix[6]);

+ matrix[8] = 0;

+ matrix[9] = 200.f;

+ matrix[10] = 0.213f - 0.213f * amount;

+ matrix[11] = 0.715f - 0.715f * amount;

+ matrix[12] = 1.f - (matrix[10] + matrix[11]);

+ matrix[13] = 0;

+ matrix[14] = 1.5f;

+ matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0;

+ matrix[18] = 1;

+ FilterOperations filters;

+ filters.Append(

+ FilterOperation::CreateReferenceFilter(SkColorFilterImageFilter::Make(

+ SkColorFilter::MakeMatrixFilterRowMajor255(matrix), nullptr)));

+ std::unique_ptr<RenderPass> child_pass = CreateTestRenderPass(

+ child_pass_id, pass_rect, transform_to_root, filters, FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state = CreateTestSharedQuadState(

@@ -1730,36 +1758,11 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) {

SharedQuadState* pass_shared_state =

CreateTestSharedQuadState(gfx::Transform(), pass_rect, root_pass.get());

- SkScalar matrix[20];

- float amount = 0.5f;

- matrix[0] = 0.213f + 0.787f * amount;

- matrix[1] = 0.715f - 0.715f * amount;

- matrix[2] = 1.f - (matrix[0] + matrix[1]);

- matrix[3] = 0;

- matrix[4] = 20.f;

- matrix[5] = 0.213f - 0.213f * amount;

- matrix[6] = 0.715f + 0.285f * amount;

- matrix[7] = 1.f - (matrix[5] + matrix[6]);

- matrix[8] = 0;

- matrix[9] = 200.f;

- matrix[10] = 0.213f - 0.213f * amount;

- matrix[11] = 0.715f - 0.715f * amount;

- matrix[12] = 1.f - (matrix[10] + matrix[11]);

- matrix[13] = 0;

- matrix[14] = 1.5f;

- matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0;

- matrix[18] = 1;

- FilterOperations filters;

- filters.Append(

- FilterOperation::CreateReferenceFilter(SkColorFilterImageFilter::Make(

- SkColorFilter::MakeMatrixFilterRowMajor255(matrix), nullptr)));

RenderPassDrawQuad* render_pass_quad =

root_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();

render_pass_quad->SetNew(pass_shared_state, pass_rect, pass_rect,

child_pass_id, 0, gfx::Vector2dF(), gfx::Size(),

- filters, gfx::Vector2dF(), gfx::PointF(),

- FilterOperations());

+ gfx::Vector2dF(), gfx::PointF());

RenderPassList pass_list;

@@ -1785,7 +1788,8 @@ TYPED_TEST(RendererPixelTest, EnlargedRenderPassTexture) {

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

gfx::Transform transform_to_root;

std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);

+ CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root,

+ FilterOperations(), FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state = CreateTestSharedQuadState(

@@ -1834,7 +1838,8 @@ TYPED_TEST(RendererPixelTest, EnlargedRenderPassTextureWithAntiAliasing) {

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

gfx::Transform transform_to_root;

std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);

+ CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root,

+ FilterOperations(), FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state = CreateTestSharedQuadState(

@@ -1899,7 +1904,8 @@ TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad) {

RenderPassId child_pass_id(2, 2);

gfx::Transform transform_to_root;

std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, viewport_rect, transform_to_root);

+ CreateTestRenderPass(child_pass_id, viewport_rect, transform_to_root,

+ FilterOperations(), FilterOperations());

SharedQuadState* child_pass_shared_state = CreateTestSharedQuadState(

gfx::Transform(), viewport_rect, child_pass.get());

@@ -1956,10 +1962,8 @@ TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad) {

gfx::Vector2dF(2.f / mask_rect.width(),

2.f / mask_rect.height()), // mask_uv_scale

gfx::Size(mask_rect.size()), // mask_texture_size

- FilterOperations(), // foreground filters

gfx::Vector2dF(), // filters scale

- gfx::PointF(), // filter origin

- FilterOperations()); // background filters

+ gfx::PointF()); // filter origin

// White background behind the masked render pass.

SolidColorDrawQuad* white =

@@ -1994,7 +1998,8 @@ TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad2) {

RenderPassId child_pass_id(2, 2);

gfx::Transform transform_to_root;

std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, viewport_rect, transform_to_root);

+ CreateTestRenderPass(child_pass_id, viewport_rect, transform_to_root,

+ FilterOperations(), FilterOperations());

SharedQuadState* child_pass_shared_state = CreateTestSharedQuadState(

gfx::Transform(), viewport_rect, child_pass.get());

@@ -2051,10 +2056,8 @@ TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad2) {

gfx::Vector2dF(2.f / mask_rect.width(),

2.f / mask_rect.height()), // mask_uv_scale

gfx::Size(mask_rect.size()), // mask_texture_size

- FilterOperations(), // foreground filters

gfx::Vector2dF(), // filters scale

- gfx::PointF(), // filter origin

- FilterOperations()); // background filters

+ gfx::PointF()); // filter origin

// White background behind the masked render pass.

SolidColorDrawQuad* white =

@@ -2088,7 +2091,8 @@ class RendererPixelTestWithBackgroundFilter

RenderPassId filter_pass_id(2, 1);

gfx::Transform transform_to_root;

std::unique_ptr<RenderPass> filter_pass = CreateTestRenderPass(

- filter_pass_id, filter_pass_layer_rect_, transform_to_root);

+ filter_pass_id, filter_pass_layer_rect_, transform_to_root,

+ FilterOperations(), this->background_filters_);

// A non-visible quad in the filtering render pass.

{

@@ -2112,10 +2116,8 @@ class RendererPixelTestWithBackgroundFilter

0, // mask_resource_id

gfx::Vector2dF(), // mask_uv_scale

gfx::Size(), // mask_texture_size

- FilterOperations(), // filters

gfx::Vector2dF(1.0f, 1.0f), // filters_scale

- gfx::PointF(), // filters_origin

- this->background_filters_);

+ gfx::PointF()); // filters_origin

}

const int kColumnWidth = device_viewport_rect.width() / 3;

@@ -2294,7 +2296,8 @@ TEST_F(ExternalStencilPixelTest, RenderSurfacesIgnoreStencil) {

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

gfx::Transform transform_to_root;

std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);

+ CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root,

+ FilterOperations(), FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state = CreateTestSharedQuadState(

@@ -2370,8 +2373,8 @@ TEST_F(GLRendererPixelTest, AxisAligned) {

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> pass =

- CreateTestRenderPass(id, rect, transform_to_root);

+ std::unique_ptr<RenderPass> pass = CreateTestRenderPass(

+ id, rect, transform_to_root, FilterOperations(), FilterOperations());

gfx::Transform red_quad_to_target_transform;

red_quad_to_target_transform.Translate(50, 50);

@@ -2417,8 +2420,8 @@ TEST_F(GLRendererPixelTest, ForceAntiAliasingOff) {

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> pass =

- CreateTestRenderPass(id, rect, transform_to_root);

+ std::unique_ptr<RenderPass> pass = CreateTestRenderPass(

+ id, rect, transform_to_root, FilterOperations(), FilterOperations());

gfx::Transform hole_quad_to_target_transform;

hole_quad_to_target_transform.Translate(50, 50);

@@ -2495,8 +2498,8 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadIdentityScale) {

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> pass =

- CreateTestRenderPass(id, viewport, transform_to_root);

+ std::unique_ptr<RenderPass> pass = CreateTestRenderPass(

+ id, viewport, transform_to_root, FilterOperations(), FilterOperations());

// One clipped blue quad in the lower right corner. Outside the clip

// is red, which should not appear.

@@ -2571,8 +2574,8 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadOpacity) {

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> pass =

- CreateTestRenderPass(id, viewport, transform_to_root);

+ std::unique_ptr<RenderPass> pass = CreateTestRenderPass(

+ id, viewport, transform_to_root, FilterOperations(), FilterOperations());

// One viewport-filling 0.5-opacity green quad.

std::unique_ptr<FakeRecordingSource> green_recording =

@@ -2653,8 +2656,8 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadDisableImageFiltering) {

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> pass =

- CreateTestRenderPass(id, viewport, transform_to_root);

+ std::unique_ptr<RenderPass> pass = CreateTestRenderPass(

+ id, viewport, transform_to_root, FilterOperations(), FilterOperations());

sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(2, 2);

ASSERT_NE(surface, nullptr);

@@ -2702,8 +2705,8 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadNearestNeighbor) {

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> pass =

- CreateTestRenderPass(id, viewport, transform_to_root);

+ std::unique_ptr<RenderPass> pass = CreateTestRenderPass(

+ id, viewport, transform_to_root, FilterOperations(), FilterOperations());

sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(2, 2);

ASSERT_NE(surface, nullptr);

@@ -2771,8 +2774,8 @@ TYPED_TEST(RendererPixelTest, TileDrawQuadNearestNeighbor) {

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> pass =

- CreateTestRenderPass(id, viewport, transform_to_root);

+ std::unique_ptr<RenderPass> pass = CreateTestRenderPass(

+ id, viewport, transform_to_root, FilterOperations(), FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state =

@@ -2822,8 +2825,8 @@ TYPED_TEST(SoftwareRendererPixelTest, TextureDrawQuadNearestNeighbor) {

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> pass =

- CreateTestRenderPass(id, viewport, transform_to_root);

+ std::unique_ptr<RenderPass> pass = CreateTestRenderPass(

+ id, viewport, transform_to_root, FilterOperations(), FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state =

@@ -2874,8 +2877,8 @@ TYPED_TEST(SoftwareRendererPixelTest, TextureDrawQuadLinear) {

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> pass =

- CreateTestRenderPass(id, viewport, transform_to_root);

+ std::unique_ptr<RenderPass> pass = CreateTestRenderPass(

+ id, viewport, transform_to_root, FilterOperations(), FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state =

@@ -2906,8 +2909,8 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadNonIdentityScale) {

RenderPassId id(1, 1);

gfx::Transform transform_to_root;

- std::unique_ptr<RenderPass> pass =

- CreateTestRenderPass(id, viewport, transform_to_root);

+ std::unique_ptr<RenderPass> pass = CreateTestRenderPass(

+ id, viewport, transform_to_root, FilterOperations(), FilterOperations());

// As scaling up the blue checkerboards will cause sampling on the GPU,

// a few extra "cleanup rects" need to be added to clobber the blending

@@ -3055,7 +3058,8 @@ TEST_F(GLRendererPixelTestWithFlippedOutputSurface, ExplicitFlipTest) {

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

gfx::Transform transform_to_root;

std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);

+ CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root,

+ FilterOperations(), FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state = CreateTestSharedQuadState(

@@ -3103,7 +3107,8 @@ TEST_F(GLRendererPixelTestWithFlippedOutputSurface, CheckChildPassUnflipped) {

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

gfx::Transform transform_to_root;

std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);

+ CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root,

+ FilterOperations(), FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state = CreateTestSharedQuadState(

@@ -3151,7 +3156,8 @@ TEST_F(GLRendererPixelTest, CheckReadbackSubset) {

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

gfx::Transform transform_to_root;

std::unique_ptr<RenderPass> child_pass =

- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);

+ CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root,

+ FilterOperations(), FilterOperations());

gfx::Transform quad_to_target_transform;

SharedQuadState* shared_state = CreateTestSharedQuadState(

« cc/output/overlay_unittest.cc ('K') | « cc/output/overlay_unittest.cc ('k') | cc/output/software_renderer.h » ('j') | cc/quads/render_pass.h » ('J')