summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 11:09:52 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 11:09:52 +0000
commit9876476a3a3d99ab52a7705d3038363b7eab30fb (patch)
treed24f174e1361668a6aedbf688a5d36aa7a5ca899 /chrome/chrome.gyp
parent03eb8e9122528a2c35da2c3d0bc2694918f8b574 (diff)
downloadchromium_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/chrome.gyp')
-rw-r--r--chrome/chrome.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index fca575b..a5b89184 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -723,8 +723,6 @@
'gpu/gpu_video_service.h',
'gpu/gpu_view_win.cc',
'gpu/gpu_view_win.h',
- 'gpu/gpu_watchdog_thread.cc',
- 'gpu/gpu_watchdog_thread.h',
'gpu/media/gpu_video_device.h',
'gpu/media/fake_gl_video_decode_engine.cc',
'gpu/media/fake_gl_video_decode_engine.h',