diff options
author | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-07-24 22:45:30 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-07-24 22:45:30 +0000 |
commit | 3279794487885ea6c5ac30111a35264a51d83e4d (patch) | |
tree | a7f8498f645e013af3a8e2b84582bfb8ff3c373e /src/client/windows/handler/exception_handler.h | |
parent | Back out r996, reinstating r985. That wasn't it. (diff) | |
download | breakpad-3279794487885ea6c5ac30111a35264a51d83e4d.tar.xz |
Speculatively back out r989 per http://codereview.chromium.org/10805065/ :
Ted Mielczarek:
> You could try backing out r989, although Mozilla has been running with that
> patch for months without issue.
Me:
> src/client/windows/handler/exception_handler.cc in r989 appears to have
> formatting problems, an unwanted property change, and no real Breakpad review
> history, so maybe we should back it out anyway until the proper process is
> followed.
NACL Tests nacl_integration failures:
http://build.chromium.org/p/chromium/builders/NACL%20Tests/builds/30138
chrome src/native_client/tests/inbrowser_crash_test/crash_dump_tester.py says
that the observed failures are a symptom of crash_service.exe itself crashing.
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@998 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/windows/handler/exception_handler.h')
-rw-r--r-- | src/client/windows/handler/exception_handler.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/client/windows/handler/exception_handler.h b/src/client/windows/handler/exception_handler.h index 38c2c3ca..09f5177c 100644 --- a/src/client/windows/handler/exception_handler.h +++ b/src/client/windows/handler/exception_handler.h @@ -67,7 +67,6 @@ #include <string> #include <vector> -#include <list> #include "client/windows/common/ipc_protocol.h" #include "client/windows/crash_generation/crash_generation_client.h" @@ -79,16 +78,6 @@ namespace google_breakpad { using std::vector; using std::wstring; -// These entries store a list of memory regions that the client wants included -// in the minidump. -struct AppMemory { - AppMemory(ULONG64 ptr, ULONG length) : ptr(ptr), length(length) {} - - ULONG64 ptr; - ULONG length; -}; -typedef std::list<AppMemory> AppMemoryList; - class ExceptionHandler { public: // A callback function to run before Breakpad performs any substantial @@ -230,11 +219,6 @@ class ExceptionHandler { // Returns whether out-of-process dump generation is used or not. bool IsOutOfProcess() const { return crash_generation_client_.get() != NULL; } - // Calling RegisterAppMemory(p, len) causes len bytes starting - // at address p to be copied to the minidump when a crash happens. - void RegisterAppMemory(void *ptr, size_t length); - void UnregisterAppMemory(void *ptr); - private: friend class AutoExceptionHandler; @@ -420,10 +404,6 @@ class ExceptionHandler { // to not interfere with debuggers. bool handle_debug_exceptions_; - // Callers can request additional memory regions to be included in - // the dump. - AppMemoryList app_memory_info_; - // A stack of ExceptionHandler objects that have installed unhandled // exception filters. This vector is used by HandleException to determine // which ExceptionHandler object to route an exception to. When an |