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/renderer/gpu_channel_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/renderer/gpu_channel_host.h')
| -rw-r--r-- | chrome/renderer/gpu_channel_host.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/renderer/gpu_channel_host.h b/chrome/renderer/gpu_channel_host.h index 847d918..c139219 100644 --- a/chrome/renderer/gpu_channel_host.h +++ b/chrome/renderer/gpu_channel_host.h @@ -29,12 +29,12 @@ class GpuChannelHost : public IPC::Channel::Listener, public: enum State { // Not yet connected. - kUnconnected, + UNCONNECTED, // Ready to use. - kConnected, + CONNECTED, // An error caused the host to become disconnected. Recreate channel to // reestablish connection. - kLost + LOST }; // Called on the render thread |