| 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 histogram_pointer->Add(value); | 203 histogram_pointer->Add(value); |
| 204 #if defined(OS_WIN) | 204 #if defined(OS_WIN) |
| 205 histogram_pointer = base::LinearHistogram::FactoryGet( | 205 histogram_pointer = base::LinearHistogram::FactoryGet( |
| 206 kGpuBlacklistFeatureHistogramNamesWin[i], | 206 kGpuBlacklistFeatureHistogramNamesWin[i], |
| 207 1, kNumWinSubVersions * kGpuFeatureNumStatus, | 207 1, kNumWinSubVersions * kGpuFeatureNumStatus, |
| 208 kNumWinSubVersions * kGpuFeatureNumStatus + 1, | 208 kNumWinSubVersions * kGpuFeatureNumStatus + 1, |
| 209 base::HistogramBase::kUmaTargetedHistogramFlag); | 209 base::HistogramBase::kUmaTargetedHistogramFlag); |
| 210 histogram_pointer->Add(GetGpuBlacklistHistogramValueWin(value)); | 210 histogram_pointer->Add(GetGpuBlacklistHistogramValueWin(value)); |
| 211 #endif | 211 #endif |
| 212 } | 212 } |
| 213 | |
| 214 UMA_HISTOGRAM_SPARSE_SLOWLY("GPU.GLResetNotificationStrategy", | |
| 215 gpu_info.gl_reset_notification_strategy); | |
| 216 } | 213 } |
| 217 | 214 |
| 218 // Combine the integers into a string, seperated by ','. | 215 // Combine the integers into a string, seperated by ','. |
| 219 std::string IntSetToString(const std::set<int>& list) { | 216 std::string IntSetToString(const std::set<int>& list) { |
| 220 std::string rt; | 217 std::string rt; |
| 221 for (std::set<int>::const_iterator it = list.begin(); | 218 for (std::set<int>::const_iterator it = list.begin(); |
| 222 it != list.end(); ++it) { | 219 it != list.end(); ++it) { |
| 223 if (!rt.empty()) | 220 if (!rt.empty()) |
| 224 rt += ","; | 221 rt += ","; |
| 225 rt += base::IntToString(*it); | 222 rt += base::IntToString(*it); |
| (...skipping 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1313 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1310 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
| 1314 #if defined(OS_WIN) | 1311 #if defined(OS_WIN) |
| 1315 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1312 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
| 1316 #endif | 1313 #endif |
| 1317 complete_gpu_info_already_requested_ = true; | 1314 complete_gpu_info_already_requested_ = true; |
| 1318 // Some observers might be waiting. | 1315 // Some observers might be waiting. |
| 1319 NotifyGpuInfoUpdate(); | 1316 NotifyGpuInfoUpdate(); |
| 1320 } | 1317 } |
| 1321 | 1318 |
| 1322 } // namespace content | 1319 } // namespace content |
| OLD | NEW |