Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: cc/ipc/struct_traits_unittest.cc

Issue 2700533002: CopyOutputRequest must have a working result_callback_ when received over mojo (Closed)
Patch Set: Addressed Dana's comments Created 3 years, 10 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "base/run_loop.h" 6 #include "base/run_loop.h"
7 #include "cc/input/selection.h" 7 #include "cc/input/selection.h"
8 #include "cc/ipc/copy_output_request_struct_traits.h"
8 #include "cc/ipc/traits_test_service.mojom.h" 9 #include "cc/ipc/traits_test_service.mojom.h"
9 #include "cc/output/copy_output_result.h" 10 #include "cc/output/copy_output_result.h"
10 #include "cc/quads/debug_border_draw_quad.h" 11 #include "cc/quads/debug_border_draw_quad.h"
11 #include "cc/quads/render_pass.h" 12 #include "cc/quads/render_pass.h"
12 #include "cc/quads/render_pass_draw_quad.h" 13 #include "cc/quads/render_pass_draw_quad.h"
13 #include "cc/quads/solid_color_draw_quad.h" 14 #include "cc/quads/solid_color_draw_quad.h"
14 #include "cc/quads/stream_video_draw_quad.h" 15 #include "cc/quads/stream_video_draw_quad.h"
15 #include "cc/quads/surface_draw_quad.h" 16 #include "cc/quads/surface_draw_quad.h"
16 #include "cc/quads/texture_draw_quad.h" 17 #include "cc/quads/texture_draw_quad.h"
17 #include "cc/quads/yuv_video_draw_quad.h" 18 #include "cc/quads/yuv_video_draw_quad.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 void EchoTransferableResource( 124 void EchoTransferableResource(
124 const TransferableResource& t, 125 const TransferableResource& t,
125 const EchoTransferableResourceCallback& callback) override { 126 const EchoTransferableResourceCallback& callback) override {
126 callback.Run(t); 127 callback.Run(t);
127 } 128 }
128 129
129 mojo::BindingSet<TraitsTestService> traits_test_bindings_; 130 mojo::BindingSet<TraitsTestService> traits_test_bindings_;
130 DISALLOW_COPY_AND_ASSIGN(StructTraitsTest); 131 DISALLOW_COPY_AND_ASSIGN(StructTraitsTest);
131 }; 132 };
132 133
133 void StubCopyOutputRequestCallback(std::unique_ptr<CopyOutputResult> result) {} 134 void CopyOutputRequestCallback(base::Closure quit_closure,
135 gfx::Size expected_size,
136 std::unique_ptr<CopyOutputResult> result) {
137 EXPECT_EQ(expected_size, result->size());
138 quit_closure.Run();
139 }
140
141 void ResultSenderCallback(base::Closure quit_closure,
142 int* n_called,
143 std::unique_ptr<CopyOutputResult> result) {
144 ++*n_called;
145 EXPECT_TRUE(result->IsEmpty());
146 quit_closure.Run();
147 }
134 148
135 void CopyOutputResultCallback(base::Closure quit_closure, 149 void CopyOutputResultCallback(base::Closure quit_closure,
136 const gpu::SyncToken& expected_sync_token, 150 const gpu::SyncToken& expected_sync_token,
137 bool expected_is_lost, 151 bool expected_is_lost,
138 const gpu::SyncToken& sync_token, 152 const gpu::SyncToken& sync_token,
139 bool is_lost) { 153 bool is_lost) {
140 EXPECT_EQ(expected_sync_token, sync_token); 154 EXPECT_EQ(expected_sync_token, sync_token);
141 EXPECT_EQ(expected_is_lost, is_lost); 155 EXPECT_EQ(expected_is_lost, is_lost);
142 quit_closure.Run(); 156 quit_closure.Run();
143 } 157 }
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 ui::LatencyInfo::LatencyComponent component; 377 ui::LatencyInfo::LatencyComponent component;
364 EXPECT_TRUE(output.latency_info[0].FindLatency( 378 EXPECT_TRUE(output.latency_info[0].FindLatency(
365 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337, 379 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 1337,
366 &component)); 380 &component));
367 EXPECT_EQ(7331, component.sequence_number); 381 EXPECT_EQ(7331, component.sequence_number);
368 EXPECT_EQ(referenced_surfaces.size(), output.referenced_surfaces.size()); 382 EXPECT_EQ(referenced_surfaces.size(), output.referenced_surfaces.size());
369 for (uint32_t i = 0; i < referenced_surfaces.size(); ++i) 383 for (uint32_t i = 0; i < referenced_surfaces.size(); ++i)
370 EXPECT_EQ(referenced_surfaces[i], output.referenced_surfaces[i]); 384 EXPECT_EQ(referenced_surfaces[i], output.referenced_surfaces[i]);
371 } 385 }
372 386
373 TEST_F(StructTraitsTest, CopyOutputRequest) { 387 TEST_F(StructTraitsTest, CopyOutputRequest_Empty) {
388 auto input = CopyOutputRequest::CreateEmptyRequest();
389
390 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
391 std::unique_ptr<CopyOutputRequest> output;
392 proxy->EchoCopyOutputRequest(std::move(input), &output);
393
394 EXPECT_TRUE(output->IsEmpty());
395 }
396
397 TEST_F(StructTraitsTest, CopyOutputRequest_Bitmap) {
374 const gfx::Rect area(5, 7, 44, 55); 398 const gfx::Rect area(5, 7, 44, 55);
375 const auto callback = base::Bind(StubCopyOutputRequestCallback);
376 const int8_t mailbox_name[GL_MAILBOX_SIZE_CHROMIUM] = {
377 0, 9, 8, 7, 6, 5, 4, 3, 2, 1, 9, 7, 5, 3, 1, 3};
378 const uint32_t target = 3;
379 const auto source = 399 const auto source =
380 base::UnguessableToken::Deserialize(0xdeadbeef, 0xdeadf00d); 400 base::UnguessableToken::Deserialize(0xdeadbeef, 0xdeadf00d);
381 gpu::Mailbox mailbox; 401 gfx::Size size(9, 8);
382 mailbox.SetName(mailbox_name); 402 auto bitmap = base::MakeUnique<SkBitmap>();
383 TextureMailbox texture_mailbox(mailbox, gpu::SyncToken(), target); 403 bitmap->allocN32Pixels(size.width(), size.height());
404 base::RunLoop run_loop;
405 auto callback =
406 base::Bind(CopyOutputRequestCallback, run_loop.QuitClosure(), size);
384 407
385 // Test with bitmap.
386 std::unique_ptr<CopyOutputRequest> input; 408 std::unique_ptr<CopyOutputRequest> input;
387 input = CopyOutputRequest::CreateBitmapRequest(callback); 409 input = CopyOutputRequest::CreateBitmapRequest(callback);
388 input->set_area(area); 410 input->set_area(area);
389 input->set_source(source); 411 input->set_source(source);
390 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy(); 412 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
391 std::unique_ptr<CopyOutputRequest> output; 413 std::unique_ptr<CopyOutputRequest> output;
392 proxy->EchoCopyOutputRequest(std::move(input), &output); 414 proxy->EchoCopyOutputRequest(std::move(input), &output);
393 415
394 EXPECT_TRUE(output->force_bitmap_result()); 416 EXPECT_TRUE(output->force_bitmap_result());
395 EXPECT_FALSE(output->has_texture_mailbox()); 417 EXPECT_FALSE(output->has_texture_mailbox());
396 EXPECT_TRUE(output->has_area()); 418 EXPECT_TRUE(output->has_area());
397 EXPECT_EQ(area, output->area()); 419 EXPECT_EQ(area, output->area());
398 EXPECT_EQ(source, output->source()); 420 EXPECT_EQ(source, output->source());
421 output->SendBitmapResult(std::move(bitmap));
422 // If CopyOutputRequestCallback is called, this ends. Otherwise, the test
423 // will time out and fail.
424 run_loop.Run();
425 }
399 426
400 // Test with texture mailbox. 427 TEST_F(StructTraitsTest, CopyOutputRequest_Texture) {
401 input = CopyOutputRequest::CreateRequest(callback); 428 const int8_t mailbox_name[GL_MAILBOX_SIZE_CHROMIUM] = {
429 0, 9, 8, 7, 6, 5, 4, 3, 2, 1, 9, 7, 5, 3, 1, 3};
430 const uint32_t target = 3;
431 gpu::Mailbox mailbox;
432 mailbox.SetName(mailbox_name);
433 TextureMailbox texture_mailbox(mailbox, gpu::SyncToken(), target);
434 base::RunLoop run_loop;
435 auto callback = base::Bind(CopyOutputRequestCallback, run_loop.QuitClosure(),
436 gfx::Size());
437
438 auto input = CopyOutputRequest::CreateRequest(callback);
402 input->SetTextureMailbox(texture_mailbox); 439 input->SetTextureMailbox(texture_mailbox);
403 440
404 std::unique_ptr<CopyOutputRequest> output2; 441 mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
405 proxy->EchoCopyOutputRequest(std::move(input), &output2); 442 std::unique_ptr<CopyOutputRequest> output;
443 proxy->EchoCopyOutputRequest(std::move(input), &output);
406 444
407 EXPECT_TRUE(output2->has_texture_mailbox()); 445 EXPECT_TRUE(output->has_texture_mailbox());
408 EXPECT_FALSE(output2->has_area()); 446 EXPECT_FALSE(output->has_area());
409 EXPECT_EQ(mailbox, output2->texture_mailbox().mailbox()); 447 EXPECT_EQ(mailbox, output->texture_mailbox().mailbox());
410 EXPECT_EQ(target, output2->texture_mailbox().target()); 448 EXPECT_EQ(target, output->texture_mailbox().target());
411 EXPECT_FALSE(output2->has_source()); 449 EXPECT_FALSE(output->has_source());
450 output->SendEmptyResult();
451 // If CopyOutputRequestCallback is called, this ends. Otherwise, the test
452 // will time out and fail.
453 run_loop.Run();
454 }
455
456 TEST_F(StructTraitsTest, CopyOutputRequest_ResultSender) {
457 int n_called = 0;
458 base::RunLoop run_loop;
459 auto request = CopyOutputRequest::CreateRequest(
460 base::Bind(ResultSenderCallback, run_loop.QuitClosure(), &n_called));
461 auto result_sender = mojo::StructTraits<
462 mojom::CopyOutputRequestDataView,
463 std::unique_ptr<CopyOutputRequest>>::result_sender(request);
464 // We close the message pipe. The callback has to run once with an empty
465 // result.
466 EXPECT_EQ(0, n_called);
467 result_sender.reset();
468 run_loop.Run();
469 EXPECT_EQ(1, n_called);
412 } 470 }
413 471
414 TEST_F(StructTraitsTest, CopyOutputResult_Bitmap) { 472 TEST_F(StructTraitsTest, CopyOutputResult_Bitmap) {
415 auto bitmap = base::MakeUnique<SkBitmap>(); 473 auto bitmap = base::MakeUnique<SkBitmap>();
416 bitmap->allocN32Pixels(7, 8); 474 bitmap->allocN32Pixels(7, 8);
417 bitmap->eraseARGB(123, 213, 77, 33); 475 bitmap->eraseARGB(123, 213, 77, 33);
418 auto in_bitmap = base::MakeUnique<SkBitmap>(); 476 auto in_bitmap = base::MakeUnique<SkBitmap>();
419 bitmap->deepCopyTo(in_bitmap.get()); 477 bitmap->deepCopyTo(in_bitmap.get());
420 auto input = CopyOutputResult::CreateBitmapResult(std::move(bitmap)); 478 auto input = CopyOutputResult::CreateBitmapResult(std::move(bitmap));
421 auto size = input->size(); 479 auto size = input->size();
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
1105 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id()); 1163 EXPECT_EQ(u_plane_resource_id, out_quad->u_plane_resource_id());
1106 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id()); 1164 EXPECT_EQ(v_plane_resource_id, out_quad->v_plane_resource_id());
1107 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id()); 1165 EXPECT_EQ(a_plane_resource_id, out_quad->a_plane_resource_id());
1108 EXPECT_EQ(color_space, out_quad->color_space); 1166 EXPECT_EQ(color_space, out_quad->color_space);
1109 EXPECT_EQ(resource_offset, out_quad->resource_offset); 1167 EXPECT_EQ(resource_offset, out_quad->resource_offset);
1110 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier); 1168 EXPECT_EQ(resource_multiplier, out_quad->resource_multiplier);
1111 EXPECT_EQ(bits_per_channel, out_quad->bits_per_channel); 1169 EXPECT_EQ(bits_per_channel, out_quad->bits_per_channel);
1112 } 1170 }
1113 1171
1114 } // namespace cc 1172 } // namespace cc
OLDNEW
« cc/ipc/copy_output_request_struct_traits.cc ('K') | « cc/ipc/copy_output_request_struct_traits.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698