diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 23:14:15 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 23:14:15 +0000 |
| commit | 9167faa7874a3915a533ac7aac316096d2d89c54 (patch) | |
| tree | 9db0f7ade64e95df76832b854fb40896ea3ca3a4 | |
| parent | 29800fa252d5c10cca07520ac37f4687ad10e41a (diff) | |
| download | chromium_src-9167faa7874a3915a533ac7aac316096d2d89c54.zip chromium_src-9167faa7874a3915a533ac7aac316096d2d89c54.tar.gz chromium_src-9167faa7874a3915a533ac7aac316096d2d89c54.tar.bz2 | |
Merge 158741 - Re-enable the GPU watchdog on Windows
We're seeing a lot of plugin and renderer-process hangs that are probably caused by GPU hangs, so we can try re-enabling the GPU watchdog to prevent them and see what's causing the GPU hangs.
BUG=144221
Review URL: https://chromiumcodereview.appspot.com/10993026
TBR=jbauman@chromium.org
Review URL: https://codereview.chromium.org/11028042
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@160261 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/gpu/gpu_child_thread.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 2e318a7..952dbc1 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -148,15 +148,6 @@ void GpuChildThread::OnInitialize() { enable_watchdog = false; #endif - // Disable the watchdog for Windows. It tends to abort when the GPU process - // is not hung but still taking a long time to do something. Instead, the - // browser process displays a dialog when it notices that the child window - // is hung giving the user an opportunity to terminate it. This is the - // same mechanism used to abort hung plugins. -#if defined(OS_WIN) - enable_watchdog = false; -#endif - // Start the GPU watchdog only after anything that is expected to be time // consuming has completed, otherwise the process is liable to be aborted. if (enable_watchdog) { |