From e09cee46b136f877390960323c84ef935ce5b7df Mon Sep 17 00:00:00 2001 From: "apatrick@chromium.org" Date: Tue, 9 Nov 2010 01:50:08 +0000 Subject: - Relanding 61718. I disabled the GPU watchdog in three new cases: - If the OSMesa software renderer is in use. This will disable it on bots. - When running on valgrind, whether on a bot or locally. - In debug builds I added a GPU process initialization time to the GPU info. I moved the GPU initialization code outside the watchdog protection because it can take a long time and trigger the watchdog. I increased the timeout. I set up a field trial with different timeouts to see the rate of failure for each period. Original CL description: 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 prevented GGL from failing when the GPU channel was lost. Added a command line swith to disable the watchdog thread for debugging purposes. TEST=try, local testing of all features BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65461 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/gpu_channel_host.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/renderer/gpu_channel_host.h') diff --git a/chrome/renderer/gpu_channel_host.h b/chrome/renderer/gpu_channel_host.h index dc738bd..818202e 100644 --- a/chrome/renderer/gpu_channel_host.h +++ b/chrome/renderer/gpu_channel_host.h @@ -30,12 +30,12 @@ class GpuChannelHost : public IPC::Channel::Listener, public: enum State { // Not yet connected. - UNCONNECTED, + kUnconnected, // Ready to use. - CONNECTED, + kConnected, // An error caused the host to become disconnected. Recreate channel to // reestablish connection. - LOST + kLost }; // Called on the render thread -- cgit v1.1