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/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 std::move(compositor), std::move(worker), flipped_output_surface)); | 135 std::move(compositor), std::move(worker), flipped_output_surface)); |
136 output_surface_->BindToClient(output_surface_client_.get()); | 136 output_surface_->BindToClient(output_surface_client_.get()); |
137 | 137 |
138 shared_bitmap_manager_.reset(new TestSharedBitmapManager); | 138 shared_bitmap_manager_.reset(new TestSharedBitmapManager); |
139 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); | 139 gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager); |
140 resource_provider_ = base::MakeUnique<ResourceProvider>( | 140 resource_provider_ = base::MakeUnique<ResourceProvider>( |
141 output_surface_->context_provider(), shared_bitmap_manager_.get(), | 141 output_surface_->context_provider(), shared_bitmap_manager_.get(), |
142 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, | 142 gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, |
143 output_surface_->capabilities().delegated_sync_points_required, | 143 output_surface_->capabilities().delegated_sync_points_required, |
144 settings_.renderer_settings.use_gpu_memory_buffer_resources, | 144 settings_.renderer_settings.use_gpu_memory_buffer_resources, |
| 145 settings_.enable_color_correct_rendering, |
145 settings_.renderer_settings.buffer_to_texture_target_map); | 146 settings_.renderer_settings.buffer_to_texture_target_map); |
146 | 147 |
147 texture_mailbox_deleter_ = base::MakeUnique<TextureMailboxDeleter>( | 148 texture_mailbox_deleter_ = base::MakeUnique<TextureMailboxDeleter>( |
148 base::ThreadTaskRunnerHandle::Get()); | 149 base::ThreadTaskRunnerHandle::Get()); |
149 | 150 |
150 renderer_ = base::MakeUnique<GLRenderer>( | 151 renderer_ = base::MakeUnique<GLRenderer>( |
151 &settings_.renderer_settings, output_surface_.get(), | 152 &settings_.renderer_settings, output_surface_.get(), |
152 resource_provider_.get(), texture_mailbox_deleter_.get(), 0); | 153 resource_provider_.get(), texture_mailbox_deleter_.get(), 0); |
153 renderer_->Initialize(); | 154 renderer_->Initialize(); |
154 renderer_->SetVisible(true); | 155 renderer_->SetVisible(true); |
(...skipping 26 matching lines...) Expand all Loading... |
181 std::unique_ptr<SoftwareOutputDevice> device( | 182 std::unique_ptr<SoftwareOutputDevice> device( |
182 new PixelTestSoftwareOutputDevice()); | 183 new PixelTestSoftwareOutputDevice()); |
183 output_surface_.reset(new PixelTestOutputSurface(std::move(device))); | 184 output_surface_.reset(new PixelTestOutputSurface(std::move(device))); |
184 output_surface_->BindToClient(output_surface_client_.get()); | 185 output_surface_->BindToClient(output_surface_client_.get()); |
185 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); | 186 shared_bitmap_manager_.reset(new TestSharedBitmapManager()); |
186 bool delegated_sync_points_required = false; // Meaningless for software. | 187 bool delegated_sync_points_required = false; // Meaningless for software. |
187 resource_provider_ = base::MakeUnique<ResourceProvider>( | 188 resource_provider_ = base::MakeUnique<ResourceProvider>( |
188 nullptr, shared_bitmap_manager_.get(), gpu_memory_buffer_manager_.get(), | 189 nullptr, shared_bitmap_manager_.get(), gpu_memory_buffer_manager_.get(), |
189 main_thread_task_runner_.get(), 0, 1, delegated_sync_points_required, | 190 main_thread_task_runner_.get(), 0, 1, delegated_sync_points_required, |
190 settings_.renderer_settings.use_gpu_memory_buffer_resources, | 191 settings_.renderer_settings.use_gpu_memory_buffer_resources, |
| 192 settings_.enable_color_correct_rendering, |
191 settings_.renderer_settings.buffer_to_texture_target_map); | 193 settings_.renderer_settings.buffer_to_texture_target_map); |
192 auto renderer = base::MakeUnique<SoftwareRenderer>( | 194 auto renderer = base::MakeUnique<SoftwareRenderer>( |
193 &settings_.renderer_settings, output_surface_.get(), | 195 &settings_.renderer_settings, output_surface_.get(), |
194 resource_provider_.get()); | 196 resource_provider_.get()); |
195 software_renderer_ = renderer.get(); | 197 software_renderer_ = renderer.get(); |
196 renderer_ = std::move(renderer); | 198 renderer_ = std::move(renderer); |
197 renderer_->Initialize(); | 199 renderer_->Initialize(); |
198 renderer_->SetVisible(true); | 200 renderer_->SetVisible(true); |
199 } | 201 } |
200 | 202 |
201 } // namespace cc | 203 } // namespace cc |
OLD | NEW |