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/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 return WritePNGFile(*result_bitmap_, test_data_dir.Append(ref_file), true); | 117 return WritePNGFile(*result_bitmap_, test_data_dir.Append(ref_file), true); |
118 | 118 |
119 return MatchesPNGFile( | 119 return MatchesPNGFile( |
120 *result_bitmap_, test_data_dir.Append(ref_file), comparator); | 120 *result_bitmap_, test_data_dir.Append(ref_file), comparator); |
121 } | 121 } |
122 | 122 |
123 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend, | 123 void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend, |
124 bool flipped_output_surface) { | 124 bool flipped_output_surface) { |
125 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings); | 125 enable_pixel_output_.reset(new gfx::DisableNullDrawGLBindings); |
126 | 126 |
| 127 scoped_refptr<TestInProcessContextProvider> compositor( |
| 128 new TestInProcessContextProvider(nullptr)); |
| 129 scoped_refptr<TestInProcessContextProvider> worker( |
| 130 new TestInProcessContextProvider(compositor.get())); |
127 output_surface_.reset(new PixelTestOutputSurface( | 131 output_surface_.reset(new PixelTestOutputSurface( |
128 new TestInProcessContextProvider, new TestInProcessContextProvider, | 132 std::move(compositor), std::move(worker), flipped_output_surface)); |
129 flipped_output_surface)); | |
130 output_surface_->BindToClient(output_surface_client_.get()); | 133 output_surface_->BindToClient(output_surface_client_.get()); |
131 | 134 |
132 shared_bitmap_manager_.reset(new TestSharedBitmapManager); | 135 shared_bitmap_manager_.reset(new TestSharedBitmapManager); |
133 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); | 136 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); |
134 resource_provider_ = ResourceProvider::Create( | 137 resource_provider_ = ResourceProvider::Create( |
135 output_surface_.get(), shared_bitmap_manager_.get(), | 138 output_surface_.get(), shared_bitmap_manager_.get(), |
136 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, | 139 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, |
137 settings_.renderer_settings.use_gpu_memory_buffer_resources, | 140 settings_.renderer_settings.use_gpu_memory_buffer_resources, |
138 settings_.use_image_texture_targets); | 141 settings_.use_image_texture_targets); |
139 | 142 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 output_surface_.get(), shared_bitmap_manager_.get(), | 180 output_surface_.get(), shared_bitmap_manager_.get(), |
178 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, | 181 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, |
179 settings_.renderer_settings.use_gpu_memory_buffer_resources, | 182 settings_.renderer_settings.use_gpu_memory_buffer_resources, |
180 settings_.use_image_texture_targets); | 183 settings_.use_image_texture_targets); |
181 renderer_ = | 184 renderer_ = |
182 SoftwareRenderer::Create(this, &settings_.renderer_settings, | 185 SoftwareRenderer::Create(this, &settings_.renderer_settings, |
183 output_surface_.get(), resource_provider_.get()); | 186 output_surface_.get(), resource_provider_.get()); |
184 } | 187 } |
185 | 188 |
186 } // namespace cc | 189 } // namespace cc |
OLD | NEW |