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/browser_about_handler.cc | |
| 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/browser_about_handler.cc')
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 0395051..69ad244 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -1162,11 +1162,11 @@ bool WillHandleBrowserAboutURL(GURL* url, Profile* profile) { // Handle URLs to wreck the gpu process. if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutGpuCrashURL)) { - GpuProcessHost::Get()->SendAboutGpuCrash(); + GpuProcessHost::SendAboutGpuCrash(); return true; } if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutGpuHangURL)) { - GpuProcessHost::Get()->SendAboutGpuHang(); + GpuProcessHost::SendAboutGpuHang(); return true; } |