Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / breakpad / src / client / linux / handler / exception_handler.h

diff --git a/src/breakpad/src/client/linux/handler/exception_handler.h b/src/breakpad/src/client/linux/handler/exception_handler.h
index bb88b95..591c310 100644 (file)
--- a/src/breakpad/src/client/linux/handler/exception_handler.h
+++ b/src/breakpad/src/client/linux/handler/exception_handler.h
@@ -30,15 +30,13 @@
 #ifndef CLIENT_LINUX_HANDLER_EXCEPTION_HANDLER_H_
 #define CLIENT_LINUX_HANDLER_EXCEPTION_HANDLER_H_
 
-#include <string>
-#include <vector>
-
-#include <pthread.h>
 #include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <sys/ucontext.h>
 
+#include <string>
+
 #include "client/linux/crash_generation/crash_generation_client.h"
 #include "client/linux/handler/minidump_descriptor.h"
 #include "client/linux/minidump_writer/minidump_writer.h"
@@ -129,7 +127,7 @@ class ExceptionHandler {
   ExceptionHandler(const MinidumpDescriptor& descriptor,
                    FilterCallback filter,
                    MinidumpCallback callback,
-                   void *callback_context,
+                   void* callback_context,
                    bool install_handler,
                    const int server_fd);
   ~ExceptionHandler();
@@ -228,6 +226,7 @@ class ExceptionHandler {
 
   // Report a crash signal from an SA_SIGINFO signal handler.
   bool HandleSignal(int sig, siginfo_t* info, void* uc);
+
  private:
   // Save the old signal handlers and install new ones.
   static bool InstallHandlersLocked();
@@ -258,12 +257,6 @@ class ExceptionHandler {
   // believes are never read.
   volatile HandlerCallback crash_handler_;
 
-  // The global exception handler stack. This is need becuase there may exist
-  // multiple ExceptionHandler instances in a process. Each will have itself
-  // registered in this stack.
-  static std::vector<ExceptionHandler*> *handler_stack_;
-  static pthread_mutex_t handler_stack_mutex_;
-
   // We need to explicitly enable ptrace of parent processes on some
   // kernels, but we need to know the PID of the cloned process before we
   // can do this. We create a pipe which we can use to block the