From 9167faa7874a3915a533ac7aac316096d2d89c54 Mon Sep 17 00:00:00 2001 From: "jbauman@chromium.org" Date: Thu, 4 Oct 2012 23:14:15 +0000 Subject: 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 --- content/gpu/gpu_child_thread.cc | 9 --------- 1 file changed, 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) { -- cgit v1.1