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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 if (!success) | 140 if (!success) |
141 return; | 141 return; |
142 | 142 |
143 if (gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER) { | 143 if (gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER) { |
144 gpu_memory_buffer_factory_ = | 144 gpu_memory_buffer_factory_ = |
145 gpu::GpuMemoryBufferFactory::CreateNativeType(); | 145 gpu::GpuMemoryBufferFactory::CreateNativeType(); |
146 } | 146 } |
147 | 147 |
148 gpu_service_ = base::MakeUnique<GpuService>( | 148 gpu_service_ = base::MakeUnique<GpuService>( |
149 gpu_init_->gpu_info(), gpu_init_->TakeWatchdogThread(), | 149 gpu_init_->gpu_info(), gpu_init_->TakeWatchdogThread(), |
150 gpu_memory_buffer_factory_.get(), io_runner); | 150 gpu_memory_buffer_factory_.get(), io_runner, |
| 151 gpu_init_->gpu_feature_info()); |
151 } | 152 } |
152 | 153 |
153 void GpuMain::CreateDisplayCompositorInternal( | 154 void GpuMain::CreateDisplayCompositorInternal( |
154 cc::mojom::DisplayCompositorRequest request, | 155 cc::mojom::DisplayCompositorRequest request, |
155 cc::mojom::DisplayCompositorClientPtrInfo client_info) { | 156 cc::mojom::DisplayCompositorClientPtrInfo client_info) { |
156 DCHECK(!gpu_command_service_); | 157 DCHECK(!gpu_command_service_); |
157 gpu_command_service_ = new gpu::GpuInProcessThreadService( | 158 gpu_command_service_ = new gpu::GpuInProcessThreadService( |
158 gpu_thread_.task_runner(), gpu_service_->sync_point_manager(), | 159 gpu_thread_.task_runner(), gpu_service_->sync_point_manager(), |
159 gpu_service_->mailbox_manager(), gpu_service_->share_group()); | 160 gpu_service_->mailbox_manager(), gpu_service_->share_group()); |
160 | 161 |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 // TODO(sad): https://crbug.com/645602 | 239 // TODO(sad): https://crbug.com/645602 |
239 } | 240 } |
240 | 241 |
241 bool GpuMain::EnsureSandboxInitialized( | 242 bool GpuMain::EnsureSandboxInitialized( |
242 gpu::GpuWatchdogThread* watchdog_thread) { | 243 gpu::GpuWatchdogThread* watchdog_thread) { |
243 // TODO(sad): https://crbug.com/645602 | 244 // TODO(sad): https://crbug.com/645602 |
244 return true; | 245 return true; |
245 } | 246 } |
246 | 247 |
247 } // namespace ui | 248 } // namespace ui |
OLD | NEW |