diff options
Diffstat (limited to 'chromium/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc')
| -rw-r--r-- | chromium/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/chromium/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc b/chromium/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc index 48ec028118b..82984c11006 100644 --- a/chromium/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc +++ b/chromium/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc @@ -21,7 +21,8 @@ #include "components/viz/test/compositor_frame_helpers.h" #include "components/viz/test/test_context_provider.h" #include "components/viz/test/test_gpu_memory_buffer_manager.h" -#include "mojo/public/cpp/bindings/interface_request.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" +#include "mojo/public/cpp/bindings/pending_remote.h" #include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h" #include "testing/gtest/include/gtest/gtest.h" @@ -67,18 +68,16 @@ TEST(AsyncLayerTreeFrameSinkTest, viz::TestContextProvider::Create(); viz::TestGpuMemoryBufferManager test_gpu_memory_buffer_manager; - viz::mojom::CompositorFrameSinkPtrInfo sink_info; - viz::mojom::CompositorFrameSinkRequest sink_request = - mojo::MakeRequest(&sink_info); - viz::mojom::CompositorFrameSinkClientPtr client; - viz::mojom::CompositorFrameSinkClientRequest client_request = - mojo::MakeRequest(&client); + mojo::PendingRemote<viz::mojom::CompositorFrameSink> sink_remote; + mojo::PendingReceiver<viz::mojom::CompositorFrameSink> sink_receiver = + sink_remote.InitWithNewPipeAndPassReceiver(); + mojo::PendingRemote<viz::mojom::CompositorFrameSinkClient> client; AsyncLayerTreeFrameSink::InitParams init_params; init_params.compositor_task_runner = bg_thread.task_runner(); init_params.gpu_memory_buffer_manager = &test_gpu_memory_buffer_manager; - init_params.pipes.compositor_frame_sink_info = std::move(sink_info); - init_params.pipes.client_request = std::move(client_request); + init_params.pipes.compositor_frame_sink_remote = std::move(sink_remote); + init_params.pipes.client_receiver = client.InitWithNewPipeAndPassReceiver(); auto layer_tree_frame_sink = std::make_unique<AsyncLayerTreeFrameSink>( std::move(provider), nullptr, &init_params); @@ -99,7 +98,7 @@ TEST(AsyncLayerTreeFrameSinkTest, // Closes the pipe, which should trigger calling DidLoseLayerTreeFrameSink() // (and quitting the RunLoop). There is no need to wait for BindToClient() // to complete as mojo::Binding error callbacks are processed asynchronously. - sink_request = viz::mojom::CompositorFrameSinkRequest(); + sink_receiver.reset(); close_run_loop.Run(); EXPECT_NE(base::kInvalidThreadId, called_thread_id); @@ -132,17 +131,16 @@ class AsyncLayerTreeFrameSinkSimpleTest : public testing::Test { display_rect_(1, 1) { auto context_provider = viz::TestContextProvider::Create(); - viz::mojom::CompositorFrameSinkPtrInfo sink_info; - viz::mojom::CompositorFrameSinkRequest sink_request = - mojo::MakeRequest(&sink_info); - viz::mojom::CompositorFrameSinkClientPtr client; - viz::mojom::CompositorFrameSinkClientRequest client_request = - mojo::MakeRequest(&client); + mojo::PendingRemote<viz::mojom::CompositorFrameSink> sink_remote; + mojo::PendingReceiver<viz::mojom::CompositorFrameSink> sink_receiver = + sink_remote.InitWithNewPipeAndPassReceiver(); + mojo::PendingRemote<viz::mojom::CompositorFrameSinkClient> client; init_params_.compositor_task_runner = task_runner_; init_params_.gpu_memory_buffer_manager = &test_gpu_memory_buffer_manager_; - init_params_.pipes.compositor_frame_sink_info = std::move(sink_info); - init_params_.pipes.client_request = std::move(client_request); + init_params_.pipes.compositor_frame_sink_remote = std::move(sink_remote); + init_params_.pipes.client_receiver = + client.InitWithNewPipeAndPassReceiver(); init_params_.hit_test_data_provider = std::make_unique<viz::HitTestDataProviderDrawQuad>( /*should_ask_for_child_region=*/true, /*root_accepts_events=*/true); @@ -289,15 +287,15 @@ TEST_F(AsyncLayerTreeFrameSinkSimpleTest, HitTestRegionListDuplicate) { quad3_root_1->SetNew(shared_quad_state3_root, /*rect=*/rect3_root, /*visible_rect=*/rect3_root, /*render_pass_id=*/3, /*mask_resource_id=*/0, gfx::RectF(), gfx::Size(), - /*mask_applies_to_backdrop=*/false, gfx::Vector2dF(1, 1), - gfx::PointF(), gfx::RectF(), false, 1.0f); + gfx::Vector2dF(1, 1), gfx::PointF(), gfx::RectF(), false, + 1.0f); auto* quad3_root_2 = pass3_root->quad_list.AllocateAndConstruct<viz::RenderPassDrawQuad>(); quad3_root_2->SetNew(shared_quad_state3_root, /*rect=*/rect3_root, /*visible_rect=*/rect3_root, /*render_pass_id=*/4, /*mask_resource_id=*/0, gfx::RectF(), gfx::Size(), - /*mask_applies_to_backdrop=*/false, gfx::Vector2dF(1, 1), - gfx::PointF(), gfx::RectF(), false, 1.0f); + gfx::Vector2dF(1, 1), gfx::PointF(), gfx::RectF(), false, + 1.0f); pass_list.push_back(std::move(pass3_root)); SendRenderPassList(&pass_list, /*hit_test_data_changed=*/false); @@ -393,15 +391,15 @@ TEST_F(AsyncLayerTreeFrameSinkSimpleTest, quad2_root_1->SetNew(shared_quad_state2_root, /*rect=*/rect2_root, /*visible_rect=*/rect2_root, /*render_pass_id=*/2, /*mask_resource_id=*/0, gfx::RectF(), gfx::Size(), - /*mask_applies_to_backdrop=*/false, gfx::Vector2dF(1, 1), - gfx::PointF(), gfx::RectF(), false, 1.0f); + gfx::Vector2dF(1, 1), gfx::PointF(), gfx::RectF(), false, + 1.0f); auto* quad2_root_2 = pass2_root->quad_list.AllocateAndConstruct<viz::RenderPassDrawQuad>(); quad2_root_2->SetNew(shared_quad_state2_root, /*rect=*/rect2_root, /*visible_rect=*/rect2_root, /*render_pass_id=*/3, /*mask_resource_id=*/0, gfx::RectF(), gfx::Size(), - /*mask_applies_to_backdrop=*/false, gfx::Vector2dF(1, 1), - gfx::PointF(), gfx::RectF(), false, 1.0f); + gfx::Vector2dF(1, 1), gfx::PointF(), gfx::RectF(), false, + 1.0f); pass_list.push_back(std::move(pass2_root)); SendRenderPassList(&pass_list, /*hit_test_data_changed=*/true); |