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 #ifndef GPU_IPC_SERVICE_GPU_INIT_H_ | 5 #ifndef GPU_IPC_SERVICE_GPU_INIT_H_ |
6 #define GPU_IPC_SERVICE_GPU_INIT_H_ | 6 #define GPU_IPC_SERVICE_GPU_INIT_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "gpu/config/gpu_feature_status.h" |
10 #include "gpu/config/gpu_info.h" | 11 #include "gpu/config/gpu_info.h" |
11 #include "gpu/gpu_export.h" | 12 #include "gpu/gpu_export.h" |
12 #include "gpu/ipc/service/gpu_watchdog_thread.h" | 13 #include "gpu/ipc/service/gpu_watchdog_thread.h" |
13 | 14 |
14 namespace base { | 15 namespace base { |
15 class CommandLine; | 16 class CommandLine; |
16 } | 17 } |
17 | 18 |
18 namespace gpu { | 19 namespace gpu { |
19 | 20 |
(...skipping 11 matching lines...) Expand all Loading... |
31 GpuInit(); | 32 GpuInit(); |
32 ~GpuInit(); | 33 ~GpuInit(); |
33 | 34 |
34 void set_sandbox_helper(GpuSandboxHelper* helper) { | 35 void set_sandbox_helper(GpuSandboxHelper* helper) { |
35 sandbox_helper_ = helper; | 36 sandbox_helper_ = helper; |
36 } | 37 } |
37 | 38 |
38 bool InitializeAndStartSandbox(const base::CommandLine& command_line); | 39 bool InitializeAndStartSandbox(const base::CommandLine& command_line); |
39 | 40 |
40 const GPUInfo& gpu_info() const { return gpu_info_; } | 41 const GPUInfo& gpu_info() const { return gpu_info_; } |
| 42 const GPUFeatureStatus& gpu_feature_status() const { |
| 43 return gpu_feature_status_; |
| 44 } |
41 std::unique_ptr<GpuWatchdogThread> TakeWatchdogThread() { | 45 std::unique_ptr<GpuWatchdogThread> TakeWatchdogThread() { |
42 return std::move(watchdog_thread_); | 46 return std::move(watchdog_thread_); |
43 } | 47 } |
44 | 48 |
45 private: | 49 private: |
46 GpuSandboxHelper* sandbox_helper_ = nullptr; | 50 GpuSandboxHelper* sandbox_helper_ = nullptr; |
47 std::unique_ptr<GpuWatchdogThread> watchdog_thread_; | 51 std::unique_ptr<GpuWatchdogThread> watchdog_thread_; |
48 GPUInfo gpu_info_; | 52 GPUInfo gpu_info_; |
| 53 GPUFeatureStatus gpu_feature_status_; |
49 | 54 |
50 DISALLOW_COPY_AND_ASSIGN(GpuInit); | 55 DISALLOW_COPY_AND_ASSIGN(GpuInit); |
51 }; | 56 }; |
52 | 57 |
53 } // namespace gpu | 58 } // namespace gpu |
54 | 59 |
55 #endif // GPU_IPC_SERVICE_GPU_INIT_H_ | 60 #endif // GPU_IPC_SERVICE_GPU_INIT_H_ |
OLD | NEW |