diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 11:09:52 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 11:09:52 +0000 |
| commit | 9876476a3a3d99ab52a7705d3038363b7eab30fb (patch) | |
| tree | d24f174e1361668a6aedbf688a5d36aa7a5ca899 /chrome/browser/gpu_process_host.h | |
| parent | 03eb8e9122528a2c35da2c3d0bc2694918f8b574 (diff) | |
| download | chromium_src-9876476a3a3d99ab52a7705d3038363b7eab30fb.zip chromium_src-9876476a3a3d99ab52a7705d3038363b7eab30fb.tar.gz chromium_src-9876476a3a3d99ab52a7705d3038363b7eab30fb.tar.bz2 | |
Revert 61718 - 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
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/3616011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61782 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, 2 insertions, 5 deletions
diff --git a/chrome/browser/gpu_process_host.h b/chrome/browser/gpu_process_host.h index ec43ca8..a5268ba 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. - void SendAboutGpuCrash(); + static void SendAboutGpuCrash(); // Tells the GPU process to let its main thread enter an infinite loop. // Useful for testing. - void SendAboutGpuHang(); + static void SendAboutGpuHang(); // Shutdown routine, which should only be called upon process // termination. @@ -115,9 +115,6 @@ class GpuProcessHost : public BrowserChildProcessHost { virtual bool CanShutdown(); - static void SendAboutGpuCrashInternal(); - static void SendAboutGpuHangInternal(); - bool initialized_; bool initialized_successfully_; |