| Index: content/gpu/gpu_watchdog_thread.h
|
| diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h
|
| index 68d3cd8cb8d7c9b6574e69fa21f21d418b311b5a..56b2db83abb24d90bad9fcf3b0def728f3bf99c0 100644
|
| --- a/content/gpu/gpu_watchdog_thread.h
|
| +++ b/content/gpu/gpu_watchdog_thread.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef CONTENT_GPU_GPU_WATCHDOG_THREAD_H_
|
| #define CONTENT_GPU_GPU_WATCHDOG_THREAD_H_
|
|
|
| +#include "base/files/file.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -74,6 +75,7 @@ class GpuWatchdogThread : public base::Thread,
|
|
|
| void OnAcknowledge();
|
| void OnCheck(bool after_suspend);
|
| + void BeginTerminating();
|
| void DeliberatelyTerminateToRecoverFromHang();
|
| #if defined(USE_X11)
|
| void SetupXServer();
|
| @@ -131,6 +133,14 @@ class GpuWatchdogThread : public base::Thread,
|
| base::Time check_time_;
|
| base::TimeTicks check_timeticks_;
|
|
|
| +#if defined(OS_WIN)
|
| + // Writing to this temp file is used as an additional step before crashing the
|
| + // process. That should help to distinguish true hangs from the cases when the
|
| + // watched thread is running slow being blocked on hard faults or other I/O.
|
| + base::File temp_file_for_io_checking_;
|
| + base::TimeDelta io_check_duration_;
|
| +#endif
|
| +
|
| #if defined(USE_X11)
|
| XDisplay* display_;
|
| gfx::AcceleratedWidget window_;
|
|
|