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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <memory> | 9 #include <memory> |
10 #include <utility> | 10 #include <utility> |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 | 66 |
67 enum WinSubVersion { | 67 enum WinSubVersion { |
68 kWinOthers = 0, | 68 kWinOthers = 0, |
69 kWinXP, | 69 kWinXP, |
70 kWinVista, | 70 kWinVista, |
71 kWin7, | 71 kWin7, |
72 kWin8, | 72 kWin8, |
73 kWin8_1, | 73 kWin8_1, |
74 kWin10, | 74 kWin10, |
75 kWin10_TH2, | 75 kWin10_TH2, |
76 kWin10_R1, | 76 kWin10_RS1, |
| 77 kWin10_RS2, |
77 kNumWinSubVersions | 78 kNumWinSubVersions |
78 }; | 79 }; |
79 | 80 |
80 int GetGpuBlacklistHistogramValueWin(gpu::GpuFeatureStatus status) { | 81 int GetGpuBlacklistHistogramValueWin(gpu::GpuFeatureStatus status) { |
81 static WinSubVersion sub_version = kNumWinSubVersions; | 82 static WinSubVersion sub_version = kNumWinSubVersions; |
82 if (sub_version == kNumWinSubVersions) { | 83 if (sub_version == kNumWinSubVersions) { |
83 sub_version = kWinOthers; | 84 sub_version = kWinOthers; |
84 switch (base::win::GetVersion()) { | 85 switch (base::win::GetVersion()) { |
85 case base::win::VERSION_PRE_XP: | 86 case base::win::VERSION_PRE_XP: |
86 case base::win::VERSION_XP: | 87 case base::win::VERSION_XP: |
87 case base::win::VERSION_SERVER_2003: | 88 case base::win::VERSION_SERVER_2003: |
88 case base::win::VERSION_VISTA: | 89 case base::win::VERSION_VISTA: |
89 case base::win::VERSION_WIN_LAST: | 90 case base::win::VERSION_WIN_LAST: |
90 break; | 91 break; |
91 case base::win::VERSION_WIN7: | 92 case base::win::VERSION_WIN7: |
92 sub_version = kWin7; | 93 sub_version = kWin7; |
93 break; | 94 break; |
94 case base::win::VERSION_WIN8: | 95 case base::win::VERSION_WIN8: |
95 sub_version = kWin8; | 96 sub_version = kWin8; |
96 break; | 97 break; |
97 case base::win::VERSION_WIN8_1: | 98 case base::win::VERSION_WIN8_1: |
98 sub_version = kWin8_1; | 99 sub_version = kWin8_1; |
99 break; | 100 break; |
100 case base::win::VERSION_WIN10: | 101 case base::win::VERSION_WIN10: |
101 sub_version = kWin10; | 102 sub_version = kWin10; |
102 break; | 103 break; |
103 case base::win::VERSION_WIN10_TH2: | 104 case base::win::VERSION_WIN10_TH2: |
104 sub_version = kWin10_TH2; | 105 sub_version = kWin10_TH2; |
105 break; | 106 break; |
106 case base::win::VERSION_WIN10_R1: | 107 case base::win::VERSION_WIN10_RS1: |
107 sub_version = kWin10_R1; | 108 sub_version = kWin10_RS1; |
| 109 break; |
| 110 case base::win::VERSION_WIN10_RS2: |
| 111 sub_version = kWin10_RS2; |
108 break; | 112 break; |
109 } | 113 } |
110 } | 114 } |
111 int entry_index = static_cast<int>(sub_version) * gpu::kGpuFeatureStatusMax; | 115 int entry_index = static_cast<int>(sub_version) * gpu::kGpuFeatureStatusMax; |
112 switch (status) { | 116 switch (status) { |
113 case gpu::kGpuFeatureStatusEnabled: | 117 case gpu::kGpuFeatureStatusEnabled: |
114 break; | 118 break; |
115 case gpu::kGpuFeatureStatusBlacklisted: | 119 case gpu::kGpuFeatureStatusBlacklisted: |
116 entry_index++; | 120 entry_index++; |
117 break; | 121 break; |
(...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1402 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1406 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
1403 #if defined(OS_WIN) | 1407 #if defined(OS_WIN) |
1404 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1408 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
1405 #endif | 1409 #endif |
1406 complete_gpu_info_already_requested_ = true; | 1410 complete_gpu_info_already_requested_ = true; |
1407 // Some observers might be waiting. | 1411 // Some observers might be waiting. |
1408 NotifyGpuInfoUpdate(); | 1412 NotifyGpuInfoUpdate(); |
1409 } | 1413 } |
1410 | 1414 |
1411 } // namespace content | 1415 } // namespace content |
OLD | NEW |