OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "cc/test/pixel_test.h" | 5 #include "cc/test/pixel_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/message_loop/message_loop_proxy.h" | 8 #include "base/message_loop/message_loop_proxy.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
11 #include "cc/base/switches.h" | 11 #include "cc/base/switches.h" |
12 #include "cc/output/compositor_frame_metadata.h" | 12 #include "cc/output/compositor_frame_metadata.h" |
13 #include "cc/output/copy_output_request.h" | 13 #include "cc/output/copy_output_request.h" |
14 #include "cc/output/copy_output_result.h" | 14 #include "cc/output/copy_output_result.h" |
15 #include "cc/output/gl_renderer.h" | 15 #include "cc/output/gl_renderer.h" |
16 #include "cc/output/output_surface_client.h" | 16 #include "cc/output/output_surface_client.h" |
17 #include "cc/output/software_renderer.h" | 17 #include "cc/output/software_renderer.h" |
18 #include "cc/resources/raster_worker_pool.h" | 18 #include "cc/resources/raster_worker_pool.h" |
19 #include "cc/resources/resource_provider.h" | 19 #include "cc/resources/resource_provider.h" |
20 #include "cc/resources/texture_mailbox_deleter.h" | 20 #include "cc/resources/texture_mailbox_deleter.h" |
21 #include "cc/test/fake_output_surface_client.h" | 21 #include "cc/test/fake_output_surface_client.h" |
22 #include "cc/test/paths.h" | 22 #include "cc/test/paths.h" |
23 #include "cc/test/pixel_test_output_surface.h" | 23 #include "cc/test/pixel_test_output_surface.h" |
24 #include "cc/test/pixel_test_software_output_device.h" | 24 #include "cc/test/pixel_test_software_output_device.h" |
25 #include "cc/test/pixel_test_utils.h" | 25 #include "cc/test/pixel_test_utils.h" |
26 #include "cc/test/test_in_process_context_provider.h" | 26 #include "cc/test/test_in_process_context_provider.h" |
27 #include "cc/test/test_shared_bitmap_manager.h" | 27 #include "cc/test/test_shared_bitmap_manager.h" |
| 28 #include "gpu/command_buffer/client/gles2_interface.h" |
28 #include "testing/gtest/include/gtest/gtest.h" | 29 #include "testing/gtest/include/gtest/gtest.h" |
29 | 30 |
30 namespace cc { | 31 namespace cc { |
31 | 32 |
32 PixelTest::PixelTest() | 33 PixelTest::PixelTest() |
33 : device_viewport_size_(gfx::Size(200, 200)), | 34 : device_viewport_size_(gfx::Size(200, 200)), |
34 disable_picture_quad_image_filtering_(false), | 35 disable_picture_quad_image_filtering_(false), |
35 output_surface_client_(new FakeOutputSurfaceClient) {} | 36 output_surface_client_(new FakeOutputSurfaceClient) {} |
36 | 37 |
37 PixelTest::~PixelTest() {} | 38 PixelTest::~PixelTest() {} |
(...skipping 26 matching lines...) Expand all Loading... |
64 ? device_viewport_rect | 65 ? device_viewport_rect |
65 : external_device_clip_rect_; | 66 : external_device_clip_rect_; |
66 renderer_->DecideRenderPassAllocationsForFrame(*pass_list); | 67 renderer_->DecideRenderPassAllocationsForFrame(*pass_list); |
67 renderer_->DrawFrame(pass_list, | 68 renderer_->DrawFrame(pass_list, |
68 device_scale_factor, | 69 device_scale_factor, |
69 device_viewport_rect, | 70 device_viewport_rect, |
70 device_clip_rect, | 71 device_clip_rect, |
71 disable_picture_quad_image_filtering_); | 72 disable_picture_quad_image_filtering_); |
72 | 73 |
73 // Wait for the readback to complete. | 74 // Wait for the readback to complete. |
74 resource_provider_->Finish(); | 75 if (output_surface_->context_provider()) |
| 76 output_surface_->context_provider()->ContextGL()->Finish(); |
75 run_loop.Run(); | 77 run_loop.Run(); |
76 | 78 |
77 return PixelsMatchReference(ref_file, comparator); | 79 return PixelsMatchReference(ref_file, comparator); |
78 } | 80 } |
79 | 81 |
80 void PixelTest::ReadbackResult(base::Closure quit_run_loop, | 82 void PixelTest::ReadbackResult(base::Closure quit_run_loop, |
81 scoped_ptr<CopyOutputResult> result) { | 83 scoped_ptr<CopyOutputResult> result) { |
82 ASSERT_TRUE(result->HasBitmap()); | 84 ASSERT_TRUE(result->HasBitmap()); |
83 result_bitmap_ = result->TakeBitmap().Pass(); | 85 result_bitmap_ = result->TakeBitmap().Pass(); |
84 quit_run_loop.Run(); | 86 quit_run_loop.Run(); |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 180 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
179 resource_provider_ = ResourceProvider::Create( | 181 resource_provider_ = ResourceProvider::Create( |
180 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, false); | 182 output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1, false); |
181 renderer_ = | 183 renderer_ = |
182 SoftwareRenderer::Create( | 184 SoftwareRenderer::Create( |
183 this, &settings_, output_surface_.get(), resource_provider_.get()) | 185 this, &settings_, output_surface_.get(), resource_provider_.get()) |
184 .PassAs<DirectRenderer>(); | 186 .PassAs<DirectRenderer>(); |
185 } | 187 } |
186 | 188 |
187 } // namespace cc | 189 } // namespace cc |
OLD | NEW |