cc/trees/layer_tree_host_impl_unittest.cc - Issue 2543473004: cc: Move filters from RenderPassDrawQuad to RenderPass

Unified Diff: cc/trees/layer_tree_host_impl_unittest.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

« cc/surfaces/surface_aggregator.cc ('K') | « cc/test/surface_hittest_test_helpers.cc ('k') | cc/trees/layer_tree_host_unittest.cc » ('j') | content/browser/frame_host/render_widget_host_view_guest_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/trees/layer_tree_host_impl_unittest.cc

diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc

index 4a8082a07b816ef2258b3f5ef884fb5c6a2803d8..b80f1e00dd48d8b793e4e893f0be6581e1ba1295 100644

--- a/cc/trees/layer_tree_host_impl_unittest.cc

+++ b/cc/trees/layer_tree_host_impl_unittest.cc

@@ -10995,9 +10995,12 @@ TEST_F(LayerTreeHostImplTest, RemoveUnreferencedRenderPass) {

frame.render_passes.push_back(RenderPass::Create());

RenderPass* pass1 = frame.render_passes.back().get();

- pass1->SetNew(RenderPassId(1, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());

- pass2->SetNew(RenderPassId(2, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());

- pass3->SetNew(RenderPassId(3, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());

+ pass1->SetNew(RenderPassId(1, 0), gfx::Rect(), gfx::Rect(), gfx::Transform(),

+ FilterOperations(), FilterOperations());

+ pass2->SetNew(RenderPassId(2, 0), gfx::Rect(), gfx::Rect(), gfx::Transform(),

+ FilterOperations(), FilterOperations());

+ pass3->SetNew(RenderPassId(3, 0), gfx::Rect(), gfx::Rect(), gfx::Transform(),

+ FilterOperations(), FilterOperations());

// Add a quad to each pass so they aren't empty.

SolidColorDrawQuad* color_quad;

@@ -11035,9 +11038,12 @@ TEST_F(LayerTreeHostImplTest, RemoveEmptyRenderPass) {

frame.render_passes.push_back(RenderPass::Create());

RenderPass* pass1 = frame.render_passes.back().get();

- pass1->SetNew(RenderPassId(1, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());

- pass2->SetNew(RenderPassId(2, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());

- pass3->SetNew(RenderPassId(3, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());

+ pass1->SetNew(RenderPassId(1, 0), gfx::Rect(), gfx::Rect(), gfx::Transform(),

+ FilterOperations(), FilterOperations());

+ pass2->SetNew(RenderPassId(2, 0), gfx::Rect(), gfx::Rect(), gfx::Transform(),

+ FilterOperations(), FilterOperations());

+ pass3->SetNew(RenderPassId(3, 0), gfx::Rect(), gfx::Rect(), gfx::Transform(),

+ FilterOperations(), FilterOperations());

// pass1 is not empty, but pass2 and pass3 are.

SolidColorDrawQuad* color_quad;

@@ -11080,9 +11086,12 @@ TEST_F(LayerTreeHostImplTest, DoNotRemoveEmptyRootRenderPass) {

frame.render_passes.push_back(RenderPass::Create());

RenderPass* pass1 = frame.render_passes.back().get();

- pass1->SetNew(RenderPassId(1, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());

- pass2->SetNew(RenderPassId(2, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());

- pass3->SetNew(RenderPassId(3, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());

+ pass1->SetNew(RenderPassId(1, 0), gfx::Rect(), gfx::Rect(), gfx::Transform(),

+ FilterOperations(), FilterOperations());

+ pass2->SetNew(RenderPassId(2, 0), gfx::Rect(), gfx::Rect(), gfx::Transform(),

+ FilterOperations(), FilterOperations());

+ pass3->SetNew(RenderPassId(3, 0), gfx::Rect(), gfx::Rect(), gfx::Transform(),

+ FilterOperations(), FilterOperations());

// pass3 is referenced by pass2.

RenderPassDrawQuad* rpdq =