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 740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
751 BrowserThread::PostTask( | 751 BrowserThread::PostTask( |
752 BrowserThread::UI, | 752 BrowserThread::UI, |
753 FROM_HERE, | 753 FROM_HERE, |
754 base::Bind(&GpuDataManagerImpl::ProcessCrashed, | 754 base::Bind(&GpuDataManagerImpl::ProcessCrashed, |
755 base::Unretained(owner_), | 755 base::Unretained(owner_), |
756 exit_code)); | 756 exit_code)); |
757 return; | 757 return; |
758 } | 758 } |
759 { | 759 { |
760 GpuDataManagerImpl::UnlockedSession session(owner_); | 760 GpuDataManagerImpl::UnlockedSession session(owner_); |
761 gpu_info_.process_crash_count++; | |
Ken Russell (switch to Gerrit)
2014/07/25 01:08:26
I'm sorry to be pedantic but could you please move
vmiura
2014/07/25 19:56:03
Done.
| |
761 observer_list_->Notify( | 762 observer_list_->Notify( |
762 &GpuDataManagerObserver::OnGpuProcessCrashed, exit_code); | 763 &GpuDataManagerObserver::OnGpuProcessCrashed, exit_code); |
763 } | 764 } |
764 } | 765 } |
765 | 766 |
766 base::ListValue* GpuDataManagerImplPrivate::GetLogMessages() const { | 767 base::ListValue* GpuDataManagerImplPrivate::GetLogMessages() const { |
767 base::ListValue* value = new base::ListValue; | 768 base::ListValue* value = new base::ListValue; |
768 for (size_t ii = 0; ii < log_messages_.size(); ++ii) { | 769 for (size_t ii = 0; ii < log_messages_.size(); ++ii) { |
769 base::DictionaryValue* dict = new base::DictionaryValue(); | 770 base::DictionaryValue* dict = new base::DictionaryValue(); |
770 dict->SetInteger("level", log_messages_[ii].level); | 771 dict->SetInteger("level", log_messages_[ii].level); |
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1068 | 1069 |
1069 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() { | 1070 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() { |
1070 gpu_process_accessible_ = false; | 1071 gpu_process_accessible_ = false; |
1071 gpu_info_.finalized = true; | 1072 gpu_info_.finalized = true; |
1072 complete_gpu_info_already_requested_ = true; | 1073 complete_gpu_info_already_requested_ = true; |
1073 // Some observers might be waiting. | 1074 // Some observers might be waiting. |
1074 NotifyGpuInfoUpdate(); | 1075 NotifyGpuInfoUpdate(); |
1075 } | 1076 } |
1076 | 1077 |
1077 } // namespace content | 1078 } // namespace content |
OLD | NEW |