diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 22:34:44 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 22:34:44 +0000 |
| commit | 281d17a33e0d4059bffa3e4d85e563553d244f87 (patch) | |
| tree | 2192ab8c43f21055fefd82d4ab5f9b3ea2239155 /chrome/browser/gpu_process_host.h | |
| parent | 5d1d6d841218a88cbfff5d65306331ae0beb2cfc (diff) | |
| download | chromium_src-281d17a33e0d4059bffa3e4d85e563553d244f87.zip chromium_src-281d17a33e0d4059bffa3e4d85e563553d244f87.tar.gz chromium_src-281d17a33e0d4059bffa3e4d85e563553d244f87.tar.bz2 | |
GPU process terminates on hang.
I added a watchdog thread that intermitently checks the main thread can respond to tasks posted on its message queue.
I fixed some bugs that preventede GGL from failing when the GPU channel was lost.
Added a command line swith to disable the watchdog thread for debugging purposes.
TEST=try, check WebGL works, check about:gpuhang terminates process.
BUG=38739,53871
Review URL: http://codereview.chromium.org/3528012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_process_host.h')
| -rw-r--r-- | chrome/browser/gpu_process_host.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/gpu_process_host.h b/chrome/browser/gpu_process_host.h index a5268ba..ec43ca8 100644 --- a/chrome/browser/gpu_process_host.h +++ b/chrome/browser/gpu_process_host.h @@ -29,11 +29,11 @@ class GpuProcessHost : public BrowserChildProcessHost { static GpuProcessHost* Get(); // Tells the GPU process to crash. Useful for testing. - static void SendAboutGpuCrash(); + void SendAboutGpuCrash(); // Tells the GPU process to let its main thread enter an infinite loop. // Useful for testing. - static void SendAboutGpuHang(); + void SendAboutGpuHang(); // Shutdown routine, which should only be called upon process // termination. @@ -115,6 +115,9 @@ class GpuProcessHost : public BrowserChildProcessHost { virtual bool CanShutdown(); + static void SendAboutGpuCrashInternal(); + static void SendAboutGpuHangInternal(); + bool initialized_; bool initialized_successfully_; |