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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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_.renderer_settings.buffer_to_texture_target_map); | 145 settings_.renderer_settings.buffer_to_texture_target_map); |
146 | 146 |
147 texture_mailbox_deleter_ = base::WrapUnique( | 147 texture_mailbox_deleter_ = base::WrapUnique( |
148 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())); | 148 new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())); |
149 | 149 |
150 renderer_ = base::MakeUnique<GLRenderer>( | 150 renderer_ = base::MakeUnique<GLRenderer>( |
151 &settings_.renderer_settings, output_surface_.get(), | 151 &settings_.renderer_settings, output_surface_.get(), |
152 resource_provider_.get(), texture_mailbox_deleter_.get(), 0); | 152 resource_provider_.get(), texture_mailbox_deleter_.get(), 0); |
| 153 renderer_->Initialize(); |
153 renderer_->SetVisible(true); | 154 renderer_->SetVisible(true); |
154 } | 155 } |
155 | 156 |
156 void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) { | 157 void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) { |
157 static_cast<PixelTestOutputSurface*>(output_surface_.get()) | 158 static_cast<PixelTestOutputSurface*>(output_surface_.get()) |
158 ->set_surface_expansion_size(surface_expansion); | 159 ->set_surface_expansion_size(surface_expansion); |
159 SoftwareOutputDevice* device = output_surface_->software_device(); | 160 SoftwareOutputDevice* device = output_surface_->software_device(); |
160 if (device) { | 161 if (device) { |
161 static_cast<PixelTestSoftwareOutputDevice*>(device) | 162 static_cast<PixelTestSoftwareOutputDevice*>(device) |
162 ->set_surface_expansion_size(surface_expansion); | 163 ->set_surface_expansion_size(surface_expansion); |
(...skipping 23 matching lines...) Expand all Loading... |
186 resource_provider_ = base::MakeUnique<ResourceProvider>( | 187 resource_provider_ = base::MakeUnique<ResourceProvider>( |
187 nullptr, shared_bitmap_manager_.get(), gpu_memory_buffer_manager_.get(), | 188 nullptr, shared_bitmap_manager_.get(), gpu_memory_buffer_manager_.get(), |
188 main_thread_task_runner_.get(), 0, 1, delegated_sync_points_required, | 189 main_thread_task_runner_.get(), 0, 1, delegated_sync_points_required, |
189 settings_.renderer_settings.use_gpu_memory_buffer_resources, | 190 settings_.renderer_settings.use_gpu_memory_buffer_resources, |
190 settings_.renderer_settings.buffer_to_texture_target_map); | 191 settings_.renderer_settings.buffer_to_texture_target_map); |
191 auto renderer = base::MakeUnique<SoftwareRenderer>( | 192 auto renderer = base::MakeUnique<SoftwareRenderer>( |
192 &settings_.renderer_settings, output_surface_.get(), | 193 &settings_.renderer_settings, output_surface_.get(), |
193 resource_provider_.get()); | 194 resource_provider_.get()); |
194 software_renderer_ = renderer.get(); | 195 software_renderer_ = renderer.get(); |
195 renderer_ = std::move(renderer); | 196 renderer_ = std::move(renderer); |
| 197 renderer_->Initialize(); |
196 renderer_->SetVisible(true); | 198 renderer_->SetVisible(true); |
197 } | 199 } |
198 | 200 |
199 } // namespace cc | 201 } // namespace cc |
OLD | NEW |