OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "content/browser/gpu/gpu_data_manager_impl_private.h" | 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
43 #include "ui/gl/gl_switches.h" | 43 #include "ui/gl/gl_switches.h" |
44 #include "ui/gl/gpu_switching_manager.h" | 44 #include "ui/gl/gpu_switching_manager.h" |
45 | 45 |
46 #if defined(OS_MACOSX) | 46 #if defined(OS_MACOSX) |
47 #include <ApplicationServices/ApplicationServices.h> | 47 #include <ApplicationServices/ApplicationServices.h> |
48 #endif // OS_MACOSX | 48 #endif // OS_MACOSX |
49 #if defined(OS_WIN) | 49 #if defined(OS_WIN) |
50 #include "base/win/windows_version.h" | 50 #include "base/win/windows_version.h" |
51 #endif // OS_WIN | 51 #endif // OS_WIN |
52 | 52 |
53 #if defined(USE_X11) && !defined(OS_CHROMEOS) | |
54 #include "ui/base/x/x11_util_internal.h" // nogncheck | |
55 #endif | |
56 | |
Julien Isorce Samsung
2016/09/28 17:42:51
Left over from initial Patch Sets ?
Tom (Use chromium acct)
2016/09/28 18:36:00
Yes, done :)
| |
53 namespace content { | 57 namespace content { |
54 | 58 |
55 namespace { | 59 namespace { |
56 | 60 |
57 enum GpuFeatureStatus { | 61 enum GpuFeatureStatus { |
58 kGpuFeatureEnabled = 0, | 62 kGpuFeatureEnabled = 0, |
59 kGpuFeatureBlacklisted = 1, | 63 kGpuFeatureBlacklisted = 1, |
60 kGpuFeatureDisabled = 2, // disabled by user but not blacklisted | 64 kGpuFeatureDisabled = 2, // disabled by user but not blacklisted |
61 kGpuFeatureNumStatus | 65 kGpuFeatureNumStatus |
62 }; | 66 }; |
(...skipping 1232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1295 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1299 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
1296 #if defined(OS_WIN) | 1300 #if defined(OS_WIN) |
1297 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1301 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
1298 #endif | 1302 #endif |
1299 complete_gpu_info_already_requested_ = true; | 1303 complete_gpu_info_already_requested_ = true; |
1300 // Some observers might be waiting. | 1304 // Some observers might be waiting. |
1301 NotifyGpuInfoUpdate(); | 1305 NotifyGpuInfoUpdate(); |
1302 } | 1306 } |
1303 | 1307 |
1304 } // namespace content | 1308 } // namespace content |
OLD | NEW |