summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gpu_process_host.h
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 18:43:22 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 18:43:22 +0000
commitdcc7b326b585c5de60590cd808aed91342311d05 (patch)
tree3743f9a91ccbbffb0961b6569622ac8d10867f75 /chrome/browser/gpu_process_host.h
parent155e86ad19e6b938796ceeffcf2c6143b78614d1 (diff)
downloadchromium_src-dcc7b326b585c5de60590cd808aed91342311d05.zip
chromium_src-dcc7b326b585c5de60590cd808aed91342311d05.tar.gz
chromium_src-dcc7b326b585c5de60590cd808aed91342311d05.tar.bz2
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. I made ui_tests always run with OSMesa, for consistent operation on bots and when run locally. 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 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, local testing of all features BUG=none Review URL: http://codereview.chromium.org/3794011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_process_host.h')
-rw-r--r--chrome/browser/gpu_process_host.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/gpu_process_host.h b/chrome/browser/gpu_process_host.h
index 0e14402..68e0496 100644
--- a/chrome/browser/gpu_process_host.h
+++ b/chrome/browser/gpu_process_host.h
@@ -28,13 +28,6 @@ class GpuProcessHost : public BrowserChildProcessHost {
// Getter for the singleton. This will return NULL on failure.
static GpuProcessHost* Get();
- // Tells the GPU process to crash. Useful for testing.
- static void SendAboutGpuCrash();
-
- // Tells the GPU process to let its main thread enter an infinite loop.
- // Useful for testing.
- static void SendAboutGpuHang();
-
// Shutdown routine, which should only be called upon process
// termination.
static void Shutdown();