Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "services/ui/gpu/gpu_main.h" | 5 #include "services/ui/gpu/gpu_main.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "gpu/ipc/common/gpu_memory_buffer_support.h" | 10 #include "gpu/ipc/common/gpu_memory_buffer_support.h" |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 213 gpu_memory_buffer_factory_.reset(); | 213 gpu_memory_buffer_factory_.reset(); |
| 214 gpu_init_.reset(); | 214 gpu_init_.reset(); |
| 215 } | 215 } |
| 216 | 216 |
| 217 void GpuMain::CreateGpuServiceOnGpuThread( | 217 void GpuMain::CreateGpuServiceOnGpuThread( |
| 218 mojom::GpuServiceRequest request, | 218 mojom::GpuServiceRequest request, |
| 219 mojom::GpuHostPtrInfo gpu_host_info, | 219 mojom::GpuHostPtrInfo gpu_host_info, |
| 220 const gpu::GpuPreferences& preferences) { | 220 const gpu::GpuPreferences& preferences) { |
| 221 mojom::GpuHostPtr gpu_host; | 221 mojom::GpuHostPtr gpu_host; |
| 222 gpu_host.Bind(std::move(gpu_host_info)); | 222 gpu_host.Bind(std::move(gpu_host_info)); |
| 223 gpu_service_->InitializeWithHost(std::move(gpu_host), preferences); | 223 gpu::GpuDriverBugWorkarounds workarounds( |
|
Zhenyao Mo
2017/02/13 22:14:27
We actually recomputed workarounds on GPU process
| |
| 224 base::CommandLine::ForCurrentProcess()); | |
| 225 gpu_service_->InitializeWithHost(std::move(gpu_host), preferences, | |
| 226 workarounds); | |
| 224 gpu_service_->Bind(std::move(request)); | 227 gpu_service_->Bind(std::move(request)); |
| 225 | 228 |
| 226 if (pending_display_compositor_request_.is_pending()) { | 229 if (pending_display_compositor_request_.is_pending()) { |
| 227 CreateDisplayCompositorInternal( | 230 CreateDisplayCompositorInternal( |
| 228 std::move(pending_display_compositor_request_), | 231 std::move(pending_display_compositor_request_), |
| 229 std::move(pending_display_compositor_client_info_)); | 232 std::move(pending_display_compositor_client_info_)); |
| 230 } | 233 } |
| 231 } | 234 } |
| 232 | 235 |
| 233 void GpuMain::BindGpuInternalOnGpuThread(mojom::GpuServiceRequest request) { | 236 void GpuMain::BindGpuInternalOnGpuThread(mojom::GpuServiceRequest request) { |
| 234 gpu_service_->Bind(std::move(request)); | 237 gpu_service_->Bind(std::move(request)); |
| 235 } | 238 } |
| 236 | 239 |
| 237 void GpuMain::PreSandboxStartup() { | 240 void GpuMain::PreSandboxStartup() { |
| 238 // TODO(sad): https://crbug.com/645602 | 241 // TODO(sad): https://crbug.com/645602 |
| 239 } | 242 } |
| 240 | 243 |
| 241 bool GpuMain::EnsureSandboxInitialized( | 244 bool GpuMain::EnsureSandboxInitialized( |
| 242 gpu::GpuWatchdogThread* watchdog_thread) { | 245 gpu::GpuWatchdogThread* watchdog_thread) { |
| 243 // TODO(sad): https://crbug.com/645602 | 246 // TODO(sad): https://crbug.com/645602 |
| 244 return true; | 247 return true; |
| 245 } | 248 } |
| 246 | 249 |
| 247 } // namespace ui | 250 } // namespace ui |
| OLD | NEW |