Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Crashpad Authors. All rights reserved. | 1 // Copyright 2015 The Crashpad Authors. All rights reserved. |
| 2 // | 2 // |
| 3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
| 5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
| 6 // | 6 // |
| 7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 // | 8 // |
| 9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
| 10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 std::vector<const ModuleSnapshot*> ProcessSnapshotWin::Modules() const { | 142 std::vector<const ModuleSnapshot*> ProcessSnapshotWin::Modules() const { |
| 143 INITIALIZATION_STATE_DCHECK_VALID(initialized_); | 143 INITIALIZATION_STATE_DCHECK_VALID(initialized_); |
| 144 std::vector<const ModuleSnapshot*> modules; | 144 std::vector<const ModuleSnapshot*> modules; |
| 145 for (internal::ModuleSnapshotWin* module : modules_) { | 145 for (internal::ModuleSnapshotWin* module : modules_) { |
| 146 modules.push_back(module); | 146 modules.push_back(module); |
| 147 } | 147 } |
| 148 return modules; | 148 return modules; |
| 149 } | 149 } |
| 150 | 150 |
| 151 const ExceptionSnapshot* ProcessSnapshotWin::Exception() const { | 151 const ExceptionSnapshot* ProcessSnapshotWin::Exception() const { |
| 152 CHECK(false) << "TODO(scottmg): Exception()"; | 152 //CHECK(false) << "TODO(scottmg): Exception()"; |
|
cpu_(ooo_6.6-7.5)
2015/05/12 01:06:50
you meant to delete this line? in chrome we don't
scottmg
2015/05/12 19:37:05
Removed.
| |
| 153 return nullptr; | 153 return nullptr; |
| 154 } | 154 } |
| 155 | 155 |
| 156 void ProcessSnapshotWin::InitializeThreads() { | 156 void ProcessSnapshotWin::InitializeThreads() { |
| 157 const std::vector<ProcessReaderWin::Thread>& process_reader_threads = | 157 const std::vector<ProcessReaderWin::Thread>& process_reader_threads = |
| 158 process_reader_.Threads(); | 158 process_reader_.Threads(); |
| 159 for (const ProcessReaderWin::Thread& process_reader_thread : | 159 for (const ProcessReaderWin::Thread& process_reader_thread : |
| 160 process_reader_threads) { | 160 process_reader_threads) { |
| 161 auto thread = make_scoped_ptr(new internal::ThreadSnapshotWin()); | 161 auto thread = make_scoped_ptr(new internal::ThreadSnapshotWin()); |
| 162 if (thread->Initialize(&process_reader_, process_reader_thread)) { | 162 if (thread->Initialize(&process_reader_, process_reader_thread)) { |
| 163 threads_.push_back(thread.release()); | 163 threads_.push_back(thread.release()); |
| 164 } | 164 } |
| 165 } | 165 } |
| 166 } | 166 } |
| 167 | 167 |
| 168 void ProcessSnapshotWin::InitializeModules() { | 168 void ProcessSnapshotWin::InitializeModules() { |
| 169 const std::vector<ProcessInfo::Module>& process_reader_modules = | 169 const std::vector<ProcessInfo::Module>& process_reader_modules = |
| 170 process_reader_.Modules(); | 170 process_reader_.Modules(); |
| 171 for (const ProcessInfo::Module& process_reader_module : | 171 for (const ProcessInfo::Module& process_reader_module : |
| 172 process_reader_modules) { | 172 process_reader_modules) { |
| 173 auto module = make_scoped_ptr(new internal::ModuleSnapshotWin()); | 173 auto module = make_scoped_ptr(new internal::ModuleSnapshotWin()); |
| 174 if (module->Initialize(&process_reader_, process_reader_module)) { | 174 if (module->Initialize(&process_reader_, process_reader_module)) { |
| 175 modules_.push_back(module.release()); | 175 modules_.push_back(module.release()); |
| 176 } | 176 } |
| 177 } | 177 } |
| 178 } | 178 } |
| 179 | 179 |
| 180 } // namespace crashpad | 180 } // namespace crashpad |
| OLD | NEW |