Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1737)

Side by Side Diff: components/crash/content/app/crashpad_win.cc

Issue 1921833002: Update Crashpad to 00d458adaf3868999eeab5341fce5bedb81d17a1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win fixes Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/crash/content/app/crashpad.h" 5 #include "components/crash/content/app/crashpad.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // Allow the crash server to be overridden for testing. If the variable 77 // Allow the crash server to be overridden for testing. If the variable
78 // isn't present in the environment then the default URL will remain. 78 // isn't present in the environment then the default URL will remain.
79 env->GetVar(kServerUrlVar, &url); 79 env->GetVar(kServerUrlVar, &url);
80 80
81 base::FilePath exe_file; 81 base::FilePath exe_file;
82 CHECK(PathService::Get(base::FILE_EXE, &exe_file)); 82 CHECK(PathService::Get(base::FILE_EXE, &exe_file));
83 83
84 bool is_per_user_install = 84 bool is_per_user_install =
85 crash_reporter_client->GetIsPerUserInstall(exe_file); 85 crash_reporter_client->GetIsPerUserInstall(exe_file);
86 if (crash_reporter_client->GetShouldDumpLargerDumps(is_per_user_install)) { 86 if (crash_reporter_client->GetShouldDumpLargerDumps(is_per_user_install)) {
87 const uint32_t kIndirectMemoryLimit = 4 * 1024 * 1024;
87 crashpad::CrashpadInfo::GetCrashpadInfo() 88 crashpad::CrashpadInfo::GetCrashpadInfo()
88 ->set_gather_indirectly_referenced_memory( 89 ->set_gather_indirectly_referenced_memory(
89 crashpad::TriState::kEnabled); 90 crashpad::TriState::kEnabled, kIndirectMemoryLimit);
90 } 91 }
91 92
92 // If the handler is embedded in the binary (e.g. chrome, setup), we 93 // If the handler is embedded in the binary (e.g. chrome, setup), we
93 // reinvoke it with --type=crashpad-handler. Otherwise, we use the 94 // reinvoke it with --type=crashpad-handler. Otherwise, we use the
94 // standalone crashpad_handler.exe (for tests, etc.). 95 // standalone crashpad_handler.exe (for tests, etc.).
95 std::vector<std::string> arguments; 96 std::vector<std::string> arguments;
96 if (embedded_handler) { 97 if (embedded_handler) {
97 arguments.push_back(std::string("--type=") + switches::kCrashpadHandler); 98 arguments.push_back(std::string("--type=") + switches::kCrashpadHandler);
98 99
99 if (startup_metric_utils::GetPreReadOptions().use_prefetch_argument) { 100 if (startup_metric_utils::GetPreReadOptions().use_prefetch_argument) {
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 void __declspec(dllexport) __cdecl UnregisterNonABICompliantCodeRange( 287 void __declspec(dllexport) __cdecl UnregisterNonABICompliantCodeRange(
287 void* start) { 288 void* start) {
288 ExceptionHandlerRecord* record = 289 ExceptionHandlerRecord* record =
289 reinterpret_cast<ExceptionHandlerRecord*>(start); 290 reinterpret_cast<ExceptionHandlerRecord*>(start);
290 291
291 CHECK(RtlDeleteFunctionTable(&record->runtime_function)); 292 CHECK(RtlDeleteFunctionTable(&record->runtime_function));
292 } 293 }
293 #endif // ARCH_CPU_X86_64 294 #endif // ARCH_CPU_X86_64
294 295
295 } // extern "C" 296 } // extern "C"
OLDNEW
« no previous file with comments | « build/secondary/third_party/crashpad/crashpad/client/BUILD.gn ('k') | third_party/crashpad/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698