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 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1231 | 1231 |
1232 // Note: adjusting the policies in this code will almost certainly | 1232 // Note: adjusting the policies in this code will almost certainly |
1233 // require adjusting the associated unit tests. | 1233 // require adjusting the associated unit tests. |
1234 std::string domain = GetDomainFromURL(url); | 1234 std::string domain = GetDomainFromURL(url); |
1235 | 1235 |
1236 DomainBlockMap::const_iterator iter = blocked_domains_.find(domain); | 1236 DomainBlockMap::const_iterator iter = blocked_domains_.find(domain); |
1237 if (iter != blocked_domains_.end()) { | 1237 if (iter != blocked_domains_.end()) { |
1238 // Err on the side of caution, and assume that if a particular | 1238 // Err on the side of caution, and assume that if a particular |
1239 // domain shows up in the block map, it's there for a good | 1239 // domain shows up in the block map, it's there for a good |
1240 // reason and don't let its presence there automatically expire. | 1240 // reason and don't let its presence there automatically expire. |
1241 | |
1242 UMA_HISTOGRAM_ENUMERATION("GPU.BlockStatusForClient3DAPIs", | |
1243 BLOCK_STATUS_SPECIFIC_DOMAIN_BLOCKED, | |
1244 BLOCK_STATUS_MAX); | |
1245 | |
1246 return GpuDataManagerImpl::DOMAIN_BLOCK_STATUS_BLOCKED; | 1241 return GpuDataManagerImpl::DOMAIN_BLOCK_STATUS_BLOCKED; |
1247 } | 1242 } |
1248 | 1243 |
1249 // Look at the timestamps of the recent GPU resets to see if there are | 1244 // Look at the timestamps of the recent GPU resets to see if there are |
1250 // enough within the threshold which would cause us to blacklist all | 1245 // enough within the threshold which would cause us to blacklist all |
1251 // domains. This doesn't need to be overly precise -- if time goes | 1246 // domains. This doesn't need to be overly precise -- if time goes |
1252 // backward due to a system clock adjustment, that's fine. | 1247 // backward due to a system clock adjustment, that's fine. |
1253 // | 1248 // |
1254 // TODO(kbr): make this pay attention to the TDR thresholds in the | 1249 // TODO(kbr): make this pay attention to the TDR thresholds in the |
1255 // Windows registry, but make sure it continues to be testable. | 1250 // Windows registry, but make sure it continues to be testable. |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1305 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1300 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
1306 #if defined(OS_WIN) | 1301 #if defined(OS_WIN) |
1307 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1302 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
1308 #endif | 1303 #endif |
1309 complete_gpu_info_already_requested_ = true; | 1304 complete_gpu_info_already_requested_ = true; |
1310 // Some observers might be waiting. | 1305 // Some observers might be waiting. |
1311 NotifyGpuInfoUpdate(); | 1306 NotifyGpuInfoUpdate(); |
1312 } | 1307 } |
1313 | 1308 |
1314 } // namespace content | 1309 } // namespace content |
OLD | NEW |