diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 18:43:22 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 18:43:22 +0000 |
| commit | dcc7b326b585c5de60590cd808aed91342311d05 (patch) | |
| tree | 3743f9a91ccbbffb0961b6569622ac8d10867f75 /chrome/chrome.gyp | |
| parent | 155e86ad19e6b938796ceeffcf2c6143b78614d1 (diff) | |
| download | chromium_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/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 91a4636..35bc0ef 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -724,6 +724,8 @@ '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', @@ -739,6 +741,7 @@ '<(DEPTH)/third_party/angle/include', '<(DEPTH)/third_party/angle/src', '<(DEPTH)/third_party/wtl/include', + '$(DXSDK_DIR)/include', ], 'dependencies': [ '../third_party/angle/src/build_angle.gyp:libEGL', |