diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 9 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 16 |
3 files changed, 23 insertions, 4 deletions
@@ -69,7 +69,7 @@ vars = { deps = { "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@977", + (Var("googlecode_url") % "google-breakpad") + "/trunk/src@998", "src/googleurl": (Var("googlecode_url") % "google-url") + "/trunk@175", diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 2ee6fcd..a2d41dd 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -436,6 +436,8 @@ 'src/common/linux/dump_symbols.h', 'src/common/linux/elf_symbols_to_module.cc', 'src/common/linux/elf_symbols_to_module.h', + 'src/common/linux/elfutils.cc', + 'src/common/linux/elfutils.h', 'src/common/linux/file_id.cc', 'src/common/linux/file_id.h', 'src/common/linux/memory_mapped_file.cc', @@ -493,6 +495,8 @@ 'src/common/convert_UTF.h', 'src/common/linux/elf_core_dump.cc', 'src/common/linux/elf_core_dump.h', + 'src/common/linux/elfutils.cc', + 'src/common/linux/elfutils.h', 'src/common/linux/file_id.cc', 'src/common/linux/file_id.h', 'src/common/linux/google_crashdump_uploader.cc', @@ -550,6 +554,7 @@ 'src/processor/minidump.cc', 'src/processor/pathname_stripper.cc', 'src/processor/pathname_stripper.h', + 'src/processor/scoped_ptr.h', ], 'include_dirs': [ @@ -580,6 +585,8 @@ 'src/client/linux/minidump_writer/linux_core_dumper_unittest.cc', 'src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc', 'src/client/linux/minidump_writer/minidump_writer_unittest.cc', + 'src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc', + 'src/client/linux/minidump_writer/minidump_writer_unittest_utils.h', 'src/common/linux/elf_core_dump_unittest.cc', 'src/common/linux/file_id_unittest.cc', 'src/common/linux/linux_libc_support_unittest.cc', @@ -606,12 +613,14 @@ 'target_name': 'linux_dumper_unittest_helper', 'type': 'executable', 'dependencies': [ + 'breakpad_processor_support', ], 'sources': [ 'src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc', ], 'include_dirs': [ + 'src', '..', ], }, diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 70e1e05..0b13870 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -182,11 +182,21 @@ void TestShell::InitializeTestShell(bool layout_test_mode, parsed_command_line.GetSwitchValueNative(test_shell::kCrashDumps)); if (parsed_command_line.HasSwitch(test_shell::kCrashDumpsFulldump)) { new google_breakpad::ExceptionHandler( - dir, 0, &MinidumpCallback, 0, true, - kFullDumpType, 0, 0); + dir, // dump_path + NULL, // filter + &MinidumpCallback, // callback + NULL, // callback_context + google_breakpad::ExceptionHandler::HANDLER_ALL, // handler_types + kFullDumpType, // dump_type + static_cast<const wchar_t*>(NULL), // pipe_name + NULL); // custom_info } else { new google_breakpad::ExceptionHandler( - dir, 0, &MinidumpCallback, 0, true); + dir, // dump_path + NULL, // filter + &MinidumpCallback, // callback + NULL, // callback_context + google_breakpad::ExceptionHandler::HANDLER_ALL); // handler_tpes } } } |