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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
749 } | 749 } |
750 | 750 |
751 void GpuDataManagerImplPrivate::GetBlacklistReasons( | 751 void GpuDataManagerImplPrivate::GetBlacklistReasons( |
752 base::ListValue* reasons) const { | 752 base::ListValue* reasons) const { |
753 if (gpu_blacklist_) | 753 if (gpu_blacklist_) |
754 gpu_blacklist_->GetReasons(reasons, "disabledFeatures"); | 754 gpu_blacklist_->GetReasons(reasons, "disabledFeatures"); |
755 if (gpu_driver_bug_list_) | 755 if (gpu_driver_bug_list_) |
756 gpu_driver_bug_list_->GetReasons(reasons, "workarounds"); | 756 gpu_driver_bug_list_->GetReasons(reasons, "workarounds"); |
757 } | 757 } |
758 | 758 |
759 void GpuDataManagerImplPrivate::GetDriverBugWorkarounds( | 759 std::vector<std::string> |
760 base::ListValue* workarounds) const { | 760 GpuDataManagerImplPrivate::GetDriverBugWorkarounds() const { |
| 761 std::vector<std::string> workarounds; |
761 for (std::set<int>::const_iterator it = gpu_driver_bugs_.begin(); | 762 for (std::set<int>::const_iterator it = gpu_driver_bugs_.begin(); |
762 it != gpu_driver_bugs_.end(); ++it) { | 763 it != gpu_driver_bugs_.end(); ++it) { |
763 workarounds->AppendString( | 764 workarounds.push_back( |
764 gpu::GpuDriverBugWorkaroundTypeToString( | 765 gpu::GpuDriverBugWorkaroundTypeToString( |
765 static_cast<gpu::GpuDriverBugWorkaroundType>(*it))); | 766 static_cast<gpu::GpuDriverBugWorkaroundType>(*it))); |
766 } | 767 } |
| 768 return workarounds; |
767 } | 769 } |
768 | 770 |
769 void GpuDataManagerImplPrivate::AddLogMessage( | 771 void GpuDataManagerImplPrivate::AddLogMessage( |
770 int level, const std::string& header, const std::string& message) { | 772 int level, const std::string& header, const std::string& message) { |
771 log_messages_.push_back(LogMessage(level, header, message)); | 773 log_messages_.push_back(LogMessage(level, header, message)); |
772 } | 774 } |
773 | 775 |
774 void GpuDataManagerImplPrivate::ProcessCrashed( | 776 void GpuDataManagerImplPrivate::ProcessCrashed( |
775 base::TerminationStatus exit_code) { | 777 base::TerminationStatus exit_code) { |
776 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { | 778 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1133 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1135 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
1134 #if defined(OS_WIN) | 1136 #if defined(OS_WIN) |
1135 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1137 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
1136 #endif | 1138 #endif |
1137 complete_gpu_info_already_requested_ = true; | 1139 complete_gpu_info_already_requested_ = true; |
1138 // Some observers might be waiting. | 1140 // Some observers might be waiting. |
1139 NotifyGpuInfoUpdate(); | 1141 NotifyGpuInfoUpdate(); |
1140 } | 1142 } |
1141 | 1143 |
1142 } // namespace content | 1144 } // namespace content |
OLD | NEW |